21 files changed, 144 insertions, 243 deletions
diff --git a/kandy/CMakeL10n.txt b/kandy/CMakeL10n.txt
index 5b3e85ee..bd70afb8 100644
--- a/kandy/CMakeL10n.txt
+++ b/kandy/CMakeL10n.txt
@@ -1,3 +1,9 @@
 ##### create translation templates ##############
 
 tde_l10n_create_template( "kandy" )
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/kandy.desktop/"
+    SOURCES src/kandy.desktop
+    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/kandy/src/CMakeLists.txt b/kandy/src/CMakeLists.txt
index 04130591..0cd08ec7 100644
--- a/kandy/src/CMakeLists.txt
+++ b/kandy/src/CMakeLists.txt
@@ -32,7 +32,7 @@ link_directories(
 ##### other data ################################
 
 tde_install_icons( kandy )
-install( FILES kandy.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+tde_create_translated_desktop( kandy.desktop )
 install( FILES uninstall.desktop RENAME kandy.desktop DESTINATION ${APPS_INSTALL_DIR}/Utilities )
 install( FILES kandy.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES kandyui.rc kandymobileui.rc DESTINATION ${DATA_INSTALL_DIR}/kandy )
diff --git a/kandy/src/cmdpropertiesdialog.h b/kandy/src/cmdpropertiesdialog.h
index 62ab0e3e..ca75dd1e 100644
--- a/kandy/src/cmdpropertiesdialog.h
+++ b/kandy/src/cmdpropertiesdialog.h
@@ -30,7 +30,7 @@ class ATCommand;
 
 class CmdPropertiesDialog : public CmdPropertiesDialog_base
 { 
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     CmdPropertiesDialog(ATCommand *cmd,TQWidget* parent=0,const char* name=0,
diff --git a/kandy/src/cmdpropertiesdialog_base.ui b/kandy/src/cmdpropertiesdialog_base.ui
index 7454b740..9b589d73 100644
--- a/kandy/src/cmdpropertiesdialog_base.ui
+++ b/kandy/src/cmdpropertiesdialog_base.ui
@@ -164,9 +164,9 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>editParameterName(TQListViewItem *)</slot>
     <slot access="protected">slotAccept()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kandy/src/commandscheduler.cpp b/kandy/src/commandscheduler.cpp
index cc18a666..d6a95390 100644
--- a/kandy/src/commandscheduler.cpp
+++ b/kandy/src/commandscheduler.cpp
@@ -35,8 +35,8 @@ CommandScheduler::CommandScheduler(Modem *modem,TQObject *parent,
   TQObject(parent,name),
   mModem(modem)
 {
-  connect(mModem,TQT_SIGNAL(gotLine(const char *)),
-          TQT_SLOT(processOutput(const char *)));
+  connect(mModem,TQ_SIGNAL(gotLine(const char *)),
+          TQ_SLOT(processOutput(const char *)));
 }
 
 void CommandScheduler::execute(ATCommand *command)
diff --git a/kandy/src/commandscheduler.h b/kandy/src/commandscheduler.h
index 5e3323e0..a1fd9a23 100644
--- a/kandy/src/commandscheduler.h
+++ b/kandy/src/commandscheduler.h
@@ -33,7 +33,7 @@
 class Modem;
 
 class CommandScheduler : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     CommandScheduler (Modem *modem,TQObject *parent = 0, const char *name = 0);
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index 13bd4ff6..cd2e9826 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -81,12 +81,12 @@ Kandy::Kandy(CommandScheduler *scheduler)
   setAutoSaveSettings();
 
   // allow the view to change the statusbar and caption
-  connect(mView, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
-          this,   TQT_SLOT(changeStatusbar(const TQString&)));
-  connect(mView, TQT_SIGNAL(signalChangeCaption(const TQString&)),
-          this,   TQT_SLOT(changeCaption(const TQString&)));
+  connect(mView, TQ_SIGNAL(signalChangeStatusbar(const TQString&)),
+          this,   TQ_SLOT(changeStatusbar(const TQString&)));
+  connect(mView, TQ_SIGNAL(signalChangeCaption(const TQString&)),
+          this,   TQ_SLOT(changeCaption(const TQString&)));
 
-  connect(mView,TQT_SIGNAL(modifiedChanged(bool)),TQT_SLOT(setTitle()));
+  connect(mView,TQ_SIGNAL(modifiedChanged(bool)),TQ_SLOT(setTitle()));
 
   TDEConfig *config = TDEGlobal::config();
   config->setGroup("General");
@@ -123,26 +123,26 @@ void Kandy::save(const TQString & filename)
 
 void Kandy::setupActions()
 {
-  KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
-  KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection());
-  KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection());
-//  KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection());
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+  KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+  KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection());
+  KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
+//  KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection());
+  KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
 
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
     
-  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("Mobile GUI"),0,TQT_TQOBJECT(this),TQT_SLOT(showMobileGui()),
+  new TDEAction(i18n("Mobile GUI"),0,this,TQ_SLOT(showMobileGui()),
               actionCollection(),"show_mobilegui");
 
-  mConnectAction = new TDEAction(i18n("Connect"),0,TQT_TQOBJECT(this),TQT_SLOT(modemConnect()),
+  mConnectAction = new TDEAction(i18n("Connect"),0,this,TQ_SLOT(modemConnect()),
                                actionCollection(),"modem_connect");
-  mDisconnectAction = new TDEAction(i18n("Disconnect"),0,TQT_TQOBJECT(this),
-                                  TQT_SLOT(modemDisconnect()),actionCollection(),
+  mDisconnectAction = new TDEAction(i18n("Disconnect"),0,this,
+                                  TQ_SLOT(modemDisconnect()),actionCollection(),
                                   "modem_disconnect");
 
   createGUI();
@@ -252,7 +252,7 @@ void Kandy::optionsConfigureToolbars()
     // use the standard toolbar editor
     saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
     KEditToolbar dlg(actionCollection());
-    connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig()));
+    connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig()));
     dlg.exec();
 }
 
diff --git a/kandy/src/kandy.desktop b/kandy/src/kandy.desktop
index ab134700..a6037bdd 100644
--- a/kandy/src/kandy.desktop
+++ b/kandy/src/kandy.desktop
@@ -1,118 +1,13 @@
 [Desktop Entry]
 Name=Kandy
-Name[hi]=केंडी
-Name[ne]=केन्डी
-Name[ta]=Kஅன்டி
+
+GenericName=Mobile Phone Tool
+
 Comment=Tool for syncing address book data with mobile phones
-Comment[af]=Program om die adres boek data met die van 'n selfoon te sinkroniseer
-Comment[bg]=Инструмент за синхронизиране на адресника с мобилни телефони
-Comment[bs]=Alat za sinhroniziranje podataka između adresara i mobilnih telefona
-Comment[ca]=Eina per sincronitzar dades de la llibreta d'adreces amb telèfons mòbils
-Comment[cs]=Nástroj pro synchronizaci kontaktů s mobilními telefony
-Comment[da]=Værktøj til at synkronisere adressebogens data med mobiltelefoner
-Comment[de]=Werkzeug zum Abgleich von Adressbuchdaten mit dem Mobiltelefon
-Comment[el]=Εργαλείο συγχρονισμού βιβλίων διευθύνσεων με κινητά τηλέφωνα
-Comment[es]=Herramienta para sincronizar datos de la libreta de direcciones con teléfonos móviles
-Comment[et]=Vahend aadressiraamatu andmete sünkroniseerimiseks mobiiltelefoniga
-Comment[eu]=Helbide-liburua zure mugikorrarekin sinkronizatzeko tresna
-Comment[fa]=ابزار برای همگام‌سازی دادۀ کتاب نشانی با تلفنهای همراه
-Comment[fi]=Osoitekirjan tietojan ja kännykän liitostyökalu
-Comment[fr]=Outil pour synchroniser les données de carnets d'adresses avec les téléphones mobiles
-Comment[fy]=Helpmiddel om adresboekdata te syngronisearjen mei mobile tillefoans
-Comment[gl]=Ferramenta para sincronizar os datos do caderno de enderezos con teléfonos móbiles
-Comment[hu]=Segédprogram számítógép és mobiltelefon címjegyzékének szinkronizálásához
-Comment[is]=Tól sem samstillir vistfangagögn við farsíma
-Comment[it]=Strumento per sincronizzare i dati della rubrica indirizzi con i telefoni cellulari
-Comment[ja]=アドレス帳のデータを携帯電話と同期するためのツール
-Comment[kk]=Адрестік кітапшаны қалта телефонмен қадамдастыру құралы
-Comment[km]=ឧបករណ៍សម្រាប់ធ្វើសមកាលកម្មទិន្នន័យសៀវភៅអាសយដ្ឋានជាមួយនឹងទូរស័ព្ទចល័ត
-Comment[lt]=Įrankis adresų knygelės sinchronizavimui su mobiliaisiais telefonais
-Comment[mk]=Алатка за синхронизирање адресари со мобилни телефони
-Comment[ms]=Alat untuk segerakkan data buku alamat dengan telefon bimbit
-Comment[nb]=Verktøy for synkronisering av adressebok med mobiltelefoner
-Comment[nds]=Synkroniseren vun Adressbookdaten mit Mobiltelefonen
-Comment[ne]=मोबाइल फोनमा ठेगाना पुस्तिका समक्रमण गर्नका लागि उपकरण
-Comment[nl]=Hulpmiddel om adresboekgegevens te synchroniseren met mobiele telefoons
-Comment[nn]=Verktøy for å synkronisera adresseboka med mobiltelefonar
-Comment[pl]=Narzędzie do synchronizacji książki adresowej z telefonami komórkowymi
-Comment[pt]=Ferramenta para sincronizar dados do livro de endereços com telemóveis
-Comment[pt_BR]=Ferramenta para a sincronização dos dados do livro de endereços com dispositivos móveis
-Comment[ru]=Программа синхронизации адресной книги с мобильным телефоном
-Comment[sk]=Nástroj pre synchronizáciu adresára s mobilmi
-Comment[sl]=Orodje za usklajevanje podatkov adresarja z mobilnim telefonom
-Comment[sr]=Алат за синхронизацију адресара са мобилним телефонима
-Comment[sr@Latn]=Alat za sinhronizaciju adresara sa mobilnim telefonima
-Comment[sv]=Verktyg för att synkronisera adressboksdata med mobiltelefoner
-Comment[ta]= செல்பேசி கொண்ட முகவரி புத்தக தரவின் ஒன்றிணைக்கப்படுவதற்கான கருவி
-Comment[tg]=Барномаи синхронизатсияи китоби адресӣ бо телефони мобилӣ
-Comment[tr]=Cep telefonları ile adres defteri paylaşımı için araç
-Comment[uk]=Інструмент для синхронізації даних адресної книги з мобільним телефоном
-Comment[zh_CN]=将地址簿数据与移动电话同步的工具
-Comment[zh_TW]=將通訊錄與手機同步的工具
+
 Exec=kandy %i %m -caption "%c"
 Icon=kandy
 Type=Application
-GenericName=Mobile Phone Tool
-GenericName[af]=Mobiele Foon Program
-GenericName[bg]=Мобилни телефони
-GenericName[bs]=Alat za mobilne telefone
-GenericName[ca]=Eina per a telèfons mòbils
-GenericName[cs]=Nástroj pro mobilní telefony
-GenericName[cy]=Erfyn Ffôn Symudol
-GenericName[da]=Mobiltelefonværktøj
-GenericName[de]=Programm für Mobiltelefone
-GenericName[el]=Εργαλείο κινητών τηλεφώνων
-GenericName[eo]=Ilo por poŝtelefono
-GenericName[es]=Gestor de teléfonos móviles
-GenericName[et]=Mobiiltelefoni rakendus
-GenericName[eu]=Telefono mugikorrendako Tresna
-GenericName[fa]=ابزار تلفن همراه
-GenericName[fi]=Matkapuhelintyökalu
-GenericName[fr]=Outil de connexion à votre téléphone portable
-GenericName[fy]=Mobiele tillefoan-behear
-GenericName[gl]=Ferramenta para o Teléfono Móbil
-GenericName[he]=כלי טלפון נייד
-GenericName[hi]=मोबाइल फोन उपकरण
-GenericName[hr]=Alat za mobitele
-GenericName[hu]=Mobil-címjegyzék
-GenericName[is]=Farsímatól
-GenericName[it]=Strumento per i telefoni cellulari
-GenericName[ja]=携帯電話ツール
-GenericName[kk]=Қалта телефон құралы
-GenericName[km]=ឧបករណ៍ទូរស័ព្ទចល័ត
-GenericName[lt]=Mobilaus telefono įrankis
-GenericName[lv]=Mobīlā Telefona Rīks
-GenericName[mk]=Алатка за мобилни телефони
-GenericName[ms]=Alatan Fon Mudah Alih
-GenericName[nb]=Mobiltelefonverktøy
-GenericName[nds]=Mobiltelefoon-Warktüüch
-GenericName[ne]=मोबाइल फोन उपकरण
-GenericName[nl]=Mobiele telefoon-beheer
-GenericName[nn]=Mobiltelefonverktøy
-GenericName[nso]=Sebereka sago Thatha sa Mogala
-GenericName[pl]=Łącznik z telefonem komórkowym
-GenericName[pt]=Ferramenta para Telemóveis
-GenericName[pt_BR]=Ferramenta de Telefonia Móvel
-GenericName[ro]=Utilitar telefon mobil
-GenericName[ru]=Работа с мобильным телефоном
-GenericName[se]=Mátketelefuvdnareaidu
-GenericName[sk]=Nástroj pre mobily
-GenericName[sl]=Orodje za mobilni telefon
-GenericName[sr]=Алат за мобилни телефон
-GenericName[sr@Latn]=Alat za mobilni telefon
-GenericName[sv]=Verktyg för mobiltelefon
-GenericName[ta]=செல்பேசி கருவி
-GenericName[tg]=Кор бо телефони мобилӣ
-GenericName[th]=เครื่องมือสำหรับโทรศัพท์เคลื่อนที่
-GenericName[tr]=Cep Telefonu Aracı
-GenericName[uk]=Засіб для мобільних телефонів
-GenericName[uz]=Уяли телефон учун восита
-GenericName[ven]=Tshishumiswa tsha lutingo thendeleki
-GenericName[vi]=Công cụ điện thoại di động
-GenericName[xh]=Isixhobo Semfono-mfono Ekuhanjwa nayo
-GenericName[zh_CN]=移动电话工具
-GenericName[zh_TW]=行動電話工具
-GenericName[zu]=Ithuluzi Lamakhala ekhukhwini
 Terminal=false
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;Utility;Telephony;X-TDE-Utilities-Peripherals;
diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h
index 77a646ba..18848541 100644
--- a/kandy/src/kandy.h
+++ b/kandy/src/kandy.h
@@ -47,7 +47,7 @@ class KandyPrefsDialog;
  */
 class Kandy : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     /**
diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp
index 15a4eb8d..db7781de 100644
--- a/kandy/src/kandyprefsdialog.cpp
+++ b/kandy/src/kandyprefsdialog.cpp
@@ -292,66 +292,66 @@ void KandyPrefsDialog::setupAddressbookTab()
   }
   
   
-  connect( useHomeSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           HomeSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useHomeSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           HomeSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useWorkSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           WorkSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useWorkSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           WorkSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useMessagingSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           MessagingSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useMessagingSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           MessagingSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useFaxSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           FaxSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useFaxSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           FaxSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useCellSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           CellSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useCellSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           CellSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useVideoSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           VideoSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useVideoSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           VideoSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useMailboxSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           MailboxSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useMailboxSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           MailboxSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useModemSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           ModemSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useModemSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           ModemSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useCarSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           CarSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useCarSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           CarSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useISDNSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           ISDNSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useISDNSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           ISDNSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( usePagerSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           PagerSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( usePagerSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           PagerSuff->label(), TQT_SLOT(setEnabled(bool)) );
+  connect( useHomeSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           HomeSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useHomeSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           HomeSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useWorkSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           WorkSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useWorkSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           WorkSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useMessagingSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           MessagingSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useMessagingSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           MessagingSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useFaxSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           FaxSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useFaxSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           FaxSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useCellSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           CellSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useCellSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           CellSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useVideoSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           VideoSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useVideoSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           VideoSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useMailboxSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           MailboxSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useMailboxSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           MailboxSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useModemSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           ModemSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useModemSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           ModemSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useCarSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           CarSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useCarSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           CarSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useISDNSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           ISDNSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useISDNSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           ISDNSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( usePagerSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           PagerSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( usePagerSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           PagerSuff->label(), TQ_SLOT(setEnabled(bool)) );
 }
 
 void KandyPrefsDialog::setupWindowsTab()
 {
   TQFrame *topFrame = addPage(i18n("Windows"),0,
-      DesktopIcon("window_list",TDEIcon::SizeMedium));
+      DesktopIcon("window_duplicate",TDEIcon::SizeMedium));
 
   TQGridLayout *topLayout = new TQGridLayout(topFrame,6,2);
   topLayout->setSpacing(spacingHint());
diff --git a/kandy/src/kandyprefsdialog.h b/kandy/src/kandyprefsdialog.h
index b927083b..24037602 100644
--- a/kandy/src/kandyprefsdialog.h
+++ b/kandy/src/kandyprefsdialog.h
@@ -41,7 +41,7 @@
 */
 class KandyPrefsDialog : public KPrefsDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     /** Initialize dialog and pages */
diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp
index 52e9de0a..51987b30 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -65,7 +65,7 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent)
 
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
-  TQSplitter *mainSplitter = new TQSplitter( Qt::Horizontal, this );
+  TQSplitter *mainSplitter = new TQSplitter( TQt::Horizontal, this );
   topLayout->addWidget( mainSplitter );
 
   TQWidget *commandBox = new TQWidget( mainSplitter );
@@ -80,26 +80,26 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent)
   mCommandList->addColumn( i18n( "Hex" ) );
   commandLayout->addWidget( mCommandList );
 
-  connect( mCommandList, TQT_SIGNAL( doubleClicked(TQListViewItem*) ),
-           TQT_SLOT( executeCommand() ) );
+  connect( mCommandList, TQ_SIGNAL( doubleClicked(TQListViewItem*) ),
+           TQ_SLOT( executeCommand() ) );
 
   TQPushButton *buttonAdd = new TQPushButton( i18n("Add..."), commandBox );
   commandLayout->addWidget( buttonAdd );
-  connect( buttonAdd, TQT_SIGNAL( clicked() ), TQT_SLOT( addCommand() ) );
+  connect( buttonAdd, TQ_SIGNAL( clicked() ), TQ_SLOT( addCommand() ) );
 
   TQPushButton *buttonEdit = new TQPushButton( i18n("Edit..."), commandBox );
   commandLayout->addWidget( buttonEdit );
-  connect( buttonEdit, TQT_SIGNAL( clicked() ), TQT_SLOT( editCommand() ) );
+  connect( buttonEdit, TQ_SIGNAL( clicked() ), TQ_SLOT( editCommand() ) );
 
   TQPushButton *buttonDelete = new TQPushButton( i18n("Delete"), commandBox );
   commandLayout->addWidget( buttonDelete );
-  connect( buttonDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteCommand() ) );
+  connect( buttonDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteCommand() ) );
 
   TQPushButton *buttonExecute = new TQPushButton( i18n("Execute"), commandBox );
   commandLayout->addWidget( buttonExecute );
-  connect( buttonExecute, TQT_SIGNAL( clicked() ), TQT_SLOT( executeCommand() ) );
+  connect( buttonExecute, TQ_SIGNAL( clicked() ), TQ_SLOT( executeCommand() ) );
 
-  TQSplitter *ioSplitter = new TQSplitter( Qt::Vertical, mainSplitter );
+  TQSplitter *ioSplitter = new TQSplitter( TQt::Vertical, mainSplitter );
 
   TQWidget *inBox = new TQWidget( ioSplitter );
   
@@ -132,15 +132,15 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent)
   mResultView = new TQTextEdit( resultBox );
   mResultView->setReadOnly( true );
   
-  connect (mInput,TQT_SIGNAL(returnPressed()),TQT_SLOT(processLastLine()));
+  connect (mInput,TQ_SIGNAL(returnPressed()),TQ_SLOT(processLastLine()));
 
-  connect(mScheduler->modem(),TQT_SIGNAL(gotLine(const char *)),
-          TQT_SLOT(appendOutput(const char *)));
+  connect(mScheduler->modem(),TQ_SIGNAL(gotLine(const char *)),
+          TQ_SLOT(appendOutput(const char *)));
 
-  connect(mScheduler,TQT_SIGNAL(result(const TQString &)),
-          mResultView,TQT_SLOT(setText(const TQString &)));
-  connect(mScheduler,TQT_SIGNAL(commandProcessed(ATCommand *)),
-          TQT_SLOT(setResult(ATCommand *)));
+  connect(mScheduler,TQ_SIGNAL(result(const TQString &)),
+          mResultView,TQ_SLOT(setText(const TQString &)));
+  connect(mScheduler,TQ_SIGNAL(commandProcessed(ATCommand *)),
+          TQ_SLOT(setResult(ATCommand *)));
 }
 
 KandyView::~KandyView()
@@ -158,7 +158,7 @@ void KandyView::importPhonebook()
 {
 #if 0
   createMobileGui();
-  connect (mMobileGui,TQT_SIGNAL(phonebookRead()),mMobileGui,TQT_SLOT(writeKab()));
+  connect (mMobileGui,TQ_SIGNAL(phonebookRead()),mMobileGui,TQ_SLOT(writeKab()));
   mMobileGui->readPhonebook();
 #endif
 }
diff --git a/kandy/src/kandyview.h b/kandy/src/kandyview.h
index 5e6461d3..746d9916 100644
--- a/kandy/src/kandyview.h
+++ b/kandy/src/kandyview.h
@@ -50,7 +50,7 @@ class CmdPropertiesDialog;
 */
 class KandyView : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
 	/**
diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp
index a22229d5..00ca8764 100644
--- a/kandy/src/main.cpp
+++ b/kandy/src/main.cpp
@@ -135,18 +135,18 @@ int main(int argc, char **argv)
 
     args->clear();
 
-    TQObject::connect(k,TQT_SIGNAL(showMobileWin()),m,TQT_SLOT(show()));
-    TQObject::connect(m,TQT_SIGNAL(showTerminalWin()),k,TQT_SLOT(show()));
-    TQObject::connect(m,TQT_SIGNAL(showPreferencesWin()),
-                     k,TQT_SLOT(optionsPreferences()));
-
-    TQObject::connect( m->view(), TQT_SIGNAL( connectModem() ), k,
-                      TQT_SLOT( modemConnect() ) );
-    TQObject::connect( m->view(), TQT_SIGNAL( disconnectModem() ), k,
-                      TQT_SLOT( modemDisconnect() ) );
-
-    TQObject::connect( modem, TQT_SIGNAL( errorMessage( const TQString & ) ),
-                      k, TQT_SLOT( showErrorMessage( const TQString & ) ) );
+    TQObject::connect(k,TQ_SIGNAL(showMobileWin()),m,TQ_SLOT(show()));
+    TQObject::connect(m,TQ_SIGNAL(showTerminalWin()),k,TQ_SLOT(show()));
+    TQObject::connect(m,TQ_SIGNAL(showPreferencesWin()),
+                     k,TQ_SLOT(optionsPreferences()));
+
+    TQObject::connect( m->view(), TQ_SIGNAL( connectModem() ), k,
+                      TQ_SLOT( modemConnect() ) );
+    TQObject::connect( m->view(), TQ_SIGNAL( disconnectModem() ), k,
+                      TQ_SLOT( modemDisconnect() ) );
+
+    TQObject::connect( modem, TQ_SIGNAL( errorMessage( const TQString & ) ),
+                      k, TQ_SLOT( showErrorMessage( const TQString & ) ) );
 
     initModem( modem );
 
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index 819d7e0f..eb1f79a7 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -220,10 +220,10 @@ MobileGui::MobileGui( CommandScheduler *scheduler, KandyPrefs *kprefs,
   setMobState( UNLOADED );
 
   // Setup signal handlers
-  connect( mScheduler, TQT_SIGNAL( commandProcessed( ATCommand * ) ),
-           TQT_SLOT( processResult( ATCommand * ) ) );
-  connect( mScheduler->modem(), TQT_SIGNAL( gotLine( const char * ) ),
-           TQT_SLOT( termAddOutput( const char * ) ) );
+  connect( mScheduler, TQ_SIGNAL( commandProcessed( ATCommand * ) ),
+           TQ_SLOT( processResult( ATCommand * ) ) );
+  connect( mScheduler->modem(), TQ_SIGNAL( gotLine( const char * ) ),
+           TQ_SLOT( termAddOutput( const char * ) ) );
 }
 
 
diff --git a/kandy/src/mobilegui.h b/kandy/src/mobilegui.h
index 16431ae4..a8e27eaa 100644
--- a/kandy/src/mobilegui.h
+++ b/kandy/src/mobilegui.h
@@ -38,7 +38,7 @@ class AddressSyncer;
 
 class MobileGui : public MobileGui_base, virtual public KandyIface
 { 
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kandy/src/mobilegui_base.ui b/kandy/src/mobilegui_base.ui
index 83f8149e..01d77f27 100644
--- a/kandy/src/mobilegui_base.ui
+++ b/kandy/src/mobilegui_base.ui
@@ -565,7 +565,7 @@
     <tabstop>PushButton1</tabstop>
     <tabstop>PushButton8_3</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot>readKabc()</slot>
     <slot>readModelInformation()</slot>
     <slot>readPhonebook()</slot>
@@ -578,6 +578,6 @@
     <slot>termAddOutput( const char *line )</slot>
     <slot>toggleConnection()</slot>
     <slot>deleteMobPhonebook()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 33da5f56..277ec288 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -55,10 +55,10 @@ MobileMain::MobileMain(CommandScheduler *scheduler, KandyPrefs *prefs)
   setupActions();
 
   statusBar()->insertItem(i18n(" Disconnected "),1,0,true);
-  connect(mView,TQT_SIGNAL(statusMessage(const TQString &)),
-          TQT_SLOT(showStatusMessage(const TQString &)));
-  connect(mView,TQT_SIGNAL(transienStatusMessage(const TQString &)),
-          TQT_SLOT(showTransienStatusMessage(const TQString &)));
+  connect(mView,TQ_SIGNAL(statusMessage(const TQString &)),
+          TQ_SLOT(showStatusMessage(const TQString &)));
+  connect(mView,TQ_SIGNAL(transienStatusMessage(const TQString &)),
+          TQ_SLOT(showTransienStatusMessage(const TQString &)));
 
   statusBar()->show();
 
@@ -71,17 +71,17 @@ MobileMain::~MobileMain()
 
 void MobileMain::setupActions()
 {
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+  KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
 
-  new TDEAction(i18n("Terminal"),0,TQT_TQOBJECT(this),TQT_SLOT(showTerminal()),
+  new TDEAction(i18n("Terminal"),0,this,TQ_SLOT(showTerminal()),
               actionCollection(),"show_terminal");
 
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
    
-  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());
 
   createGUI("kandymobileui.rc");
 }
@@ -130,7 +130,7 @@ void MobileMain::optionsConfigureToolbars()
     // use the standard toolbar editor
     saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
     KEditToolbar dlg(actionCollection());
-    connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig()));
+    connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig()));
     dlg.exec();
 }
 
diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h
index 9270fb94..3d1ba2a3 100644
--- a/kandy/src/mobilemain.h
+++ b/kandy/src/mobilemain.h
@@ -45,7 +45,7 @@ class CommandScheduler;
  */
 class MobileMain : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     /**
diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp
index 2a275bf4..ef16d00d 100644
--- a/kandy/src/modem.cpp
+++ b/kandy/src/modem.cpp
@@ -84,7 +84,7 @@ Modem::Modem( KandyPrefs *kprefs, TQObject *parent, const char *name ) :
 
   timer = new TQTimer( this, "modemtimer" );
   TQ_CHECK_PTR( timer );
-  connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( timerDone() ) );
+  connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( timerDone() ) );
 
   init();
   xreset();
@@ -234,7 +234,7 @@ bool Modem::open()
   sn = new TQSocketNotifier( fd, TQSocketNotifier::Read, this,
                             "modemsocketnotifier" );
   TQ_CHECK_PTR( sn );
-  connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readChar( int ) ) );
+  connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readChar( int ) ) );
 
   mOpen = true;
 
@@ -372,7 +372,7 @@ void Modem::timerStart( int msec )
 void Modem::receiveXModem( bool crc )
 {
   disconnect( sn, 0, this, 0 );
-  connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readXChar( int ) ) );
+  connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readXChar( int ) ) );
 
   xcrc = crc;
 
@@ -598,7 +598,7 @@ void Modem::xreset()
 
   if ( sn ) {
     disconnect( sn, 0, this, 0 );
-    connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readChar( int ) ) );
+    connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readChar( int ) ) );
   }
 }
 
diff --git a/kandy/src/modem.h b/kandy/src/modem.h
index 65a5dd37..9c1216cb 100644
--- a/kandy/src/modem.h
+++ b/kandy/src/modem.h
@@ -45,7 +45,7 @@
 
 class Modem : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	Modem(KandyPrefs *kprefs, TQObject *parent = 0, const char *name = 0);