17 files changed, 62 insertions, 505 deletions
diff --git a/kaddressbook/kcmconfigs/CMakeLists.txt b/kaddressbook/kcmconfigs/CMakeLists.txt
index 82d494cd..78a05866 100644
--- a/kaddressbook/kcmconfigs/CMakeLists.txt
+++ b/kaddressbook/kcmconfigs/CMakeLists.txt
@@ -27,9 +27,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES
-    kabconfig.desktop kabldapconfig.desktop kabcustomfields.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kabconfig.desktop kabldapconfig.desktop kabcustomfields.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kaddressbook-desktops
+)
 
 
 ##### kcm_kabconfig (module) ####################
diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h
index 5c900c07..301b9f9f 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.h
+++ b/kaddressbook/kcmconfigs/addhostdialog.h
@@ -34,7 +34,7 @@ class TQSpinBox;
 
 class AddHostDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
   public:
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index ad1364f5..35bc17a1 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -46,20 +46,20 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
 {
   TQHBoxLayout *layout = new TQHBoxLayout( this );
 
-  TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this );
+  TQGroupBox *group = new TQGroupBox( 0, TQt::Vertical, title, this );
   TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2,
                                               KDialog::spacingHint() );
 
   mBox = new TQListBox( group );
-  connect( mBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ),
-           TQT_SLOT( selectionChanged( TQListBoxItem* ) ) );
+  connect( mBox, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ),
+           TQ_SLOT( selectionChanged( TQListBoxItem* ) ) );
   groupLayout->addWidget( mBox, 0, 0 );
 
-  KButtonBox *bbox = new KButtonBox( group, Qt::Vertical );
-  mAddButton = bbox->addButton( i18n( "Add..." ), TQT_TQOBJECT(this),  TQT_SLOT( add() ) );
-  mEditButton = bbox->addButton( i18n( "Edit..." ), TQT_TQOBJECT(this),  TQT_SLOT( edit() ) );
+  KButtonBox *bbox = new KButtonBox( group, TQt::Vertical );
+  mAddButton = bbox->addButton( i18n( "Add..." ), this,  TQ_SLOT( add() ) );
+  mEditButton = bbox->addButton( i18n( "Edit..." ), this,  TQ_SLOT( edit() ) );
   mEditButton->setEnabled( false );
-  mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this),  TQT_SLOT( remove() ) );
+  mRemoveButton = bbox->addButton( i18n( "Remove" ), this,  TQ_SLOT( remove() ) );
   mRemoveButton->setEnabled( false );
   bbox->layout();
   groupLayout->addWidget( bbox, 0, 1 );
@@ -157,10 +157,10 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
   mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) );
   layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
 
-  connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
-  connect( mInclusion, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
-  connect( mSuffix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
-  connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( modified() ) );
+  connect( mPrefix, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) );
+  connect( mInclusion, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) );
+  connect( mSuffix, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) );
+  connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( modified() ) );
 }
 
 AddresseeWidget::~AddresseeWidget()
diff --git a/kaddressbook/kcmconfigs/addresseewidget.h b/kaddressbook/kcmconfigs/addresseewidget.h
index ec476096..46651903 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.h
+++ b/kaddressbook/kcmconfigs/addresseewidget.h
@@ -35,7 +35,7 @@ class TQPushButton;
 
 class NamePartWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -68,7 +68,7 @@ class NamePartWidget : public TQWidget
 
 class AddresseeWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.h b/kaddressbook/kcmconfigs/extensionconfigdialog.h
index 0aa97f74..5c3ae856 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.h
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.h
@@ -34,7 +34,7 @@ class ConfigureWidget;
 
 class ExtensionConfigDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kaddressbook/kcmconfigs/kabconfig.desktop b/kaddressbook/kcmconfigs/kabconfig.desktop
index 5c19519a..da7759ff 100644
--- a/kaddressbook/kcmconfigs/kabconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabconfig.desktop
@@ -13,162 +13,7 @@ X-TDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
 X-TDE-CfgDlgHierarchy=KAB
 
 Name=General
-Name[af]=Algemeen
-Name[ar]=عام
-Name[bg]=Общи
-Name[br]=Pennañ
-Name[cs]=Obecné
-Name[cy]=Cyffredinol
-Name[da]=Generelt
-Name[de]=Allgemein
-Name[el]=Γενικά
-Name[eo]=Ĝenerala
-Name[et]=Üldine
-Name[eu]=Orokorra
-Name[fa]=عمومی
-Name[fi]=Yleinen
-Name[fr]=Général
-Name[fy]=Algemien
-Name[ga]=Ginearálta
-Name[gl]=Xeral
-Name[he]=כללי
-Name[hu]=Általános
-Name[is]=Almennt
-Name[it]=Generale
-Name[ja]=全般
-Name[kk]=Жалпы
-Name[km]=ទូទៅ
-Name[lt]=Bendras
-Name[mk]=Општо
-Name[ms]=Umum
-Name[nb]=Generelt
-Name[nds]=Allgemeen
-Name[ne]=साधारण
-Name[nl]=Algemeen
-Name[nn]=Generelt
-Name[pa]=ਸਧਾਰਨ
-Name[pl]=Ogólne
-Name[pt]=Geral
-Name[pt_BR]=Geral
-Name[ru]=Общие
-Name[se]=Oppalaš
-Name[sk]=Všeobecné
-Name[sl]=Splošno
-Name[sr]=Опште
-Name[sr@Latn]=Opšte
-Name[sv]=Allmänt
-Name[ta]=பொதுவான
-Name[th]=ทั่วไป
-Name[tr]=Genel
-Name[uk]=Загальні
-Name[uz]=Умумий
-Name[zh_CN]=常规
+
 Comment=Configure the Address Book
-Comment[af]=Stel die adres boek op
-Comment[ar]=إعداد دفتر العناوين
-Comment[be]=Настроіць адрасную кнігу
-Comment[bg]=Настройки на адресника
-Comment[br]=Kefluniañ ar c'harned chomlec'hioù
-Comment[bs]=Podesite Adresar
-Comment[ca]=Configura la Llibreta d'adreces
-Comment[cs]=Nastavit knihu adres
-Comment[cy]=Ffurfweddu'r Llyfr Cyfeiriadau
-Comment[da]=Indstil adressebogen
-Comment[de]=Adressbuch einrichten
-Comment[el]=Ρύθμιση του Βιβλίου διευθύνσεων
-Comment[eo]=Agordi la Adreslibron
-Comment[es]=Configura la libreta de direcciones
-Comment[et]=Aadressiraamatu seadistamine
-Comment[eu]=Konfiguratu helbide-liburua
-Comment[fa]=پیکربندی کتاب نشانی
-Comment[fi]=Muokkaa osoitekirjan asetuksia
-Comment[fr]=Configurer le carnet d'adresses
-Comment[fy]=Hjir kinne jo, jo adresboek oanpasse
-Comment[ga]=Cumraigh an Leabhar Seoltaí
-Comment[gl]=Configurar o Caderno de Enderezos
-Comment[he]=הגדרת הפנקס כתובת
-Comment[hi]=पता पुस्तिका कॉन्फ़िगर करें
-Comment[hu]=A címjegyzék beállítása
-Comment[is]=Stilla vistfangaskrána
-Comment[it]=Configura la rubrica indirizzi
-Comment[ja]=アドレス帳設定
-Comment[kk]=Адрестік кітапшаны баптау
-Comment[km]=កំណត់រចនាសម្ព័ន្ធសៀវភៅអាសយដ្ឋាន
-Comment[lt]=Konfigūruoti adresų knygelę
-Comment[mk]=Конфигурирајте го адресарот
-Comment[ms]=Konfigurkan Buku Alamat
-Comment[nb]=Oppsett for adresseboka
-Comment[nds]=Adressbook instellen
-Comment[ne]=ठेगाना पुस्तिका कन्फिगर गर्नुहोस्
-Comment[nl]=Hier kunt u uw adresboek aanpassen
-Comment[nn]=Setja opp adressebok
-Comment[pl]=Konfiguracja Książki adresowej
-Comment[pt]=Configuração do Livro de Endereços
-Comment[pt_BR]=Configurar o Livro de Endereços
-Comment[ro]=Configurează cartea de adrese
-Comment[ru]=Настройка адресной книги
-Comment[se]=Heivet čujuhusgirjji
-Comment[sk]=Nastavenie Adresára
-Comment[sl]=Nastavi Adresar
-Comment[sr]=Подешавање адресара
-Comment[sr@Latn]=Podešavanje adresara
-Comment[sv]=Anpassa adressboken
-Comment[ta]=கேமுகவரிப்புத்தகத்தை கட்டமை
-Comment[tg]=Танзимоти китоби адрес
-Comment[tr]=Adres Defterini Yapılandır
-Comment[uk]=Налаштування адресної книги
-Comment[uz]=Манзиллар дафтарини мослаш
-Comment[zh_CN]=配置地址簿
-Comment[zh_TW]=設定通訊錄
+
 Keywords=kaddressbook; configure; settings;
-Keywords[af]=kaddressbook; configure;settings;adres;
-Keywords[be]=K Адрасная кніга; настроіць; настаўленні; kaddressbook; configure; settings;
-Keywords[bg]=адресни;адресна;книга;визитник;визитка;картичка;kaddressbook; configure; settings;
-Keywords[br]=kaddressbook; kefluniañ; dibarzhoù;
-Keywords[bs]=kaddressbook; configure; settings; podesi; podesite; postavke; konfiguracija;
-Keywords[ca]=llibreta d'adreces; configura; opcions;
-Keywords[cs]=kniha adres;nastavení;
-Keywords[cy]=kaddressbook; ffurfweddu;godosiadau;
-Keywords[da]=kaddressbook; indstil; opsætning;
-Keywords[de]=KAddressbook;Adressbuch;
-Keywords[el]=kaddressbook; ρύθμιση; ρυθμίσεις;
-Keywords[eo]=kaddressbook;adresaro;agordo;
-Keywords[es]=kaddressbook; configurar; opciones;
-Keywords[et]=kde aadressiraamat; seadistamine; seadistused;
-Keywords[eu]=kaddressbook; konfiguratu; ezarpenak;
-Keywords[fa]=kaddressbook، پیکربندی، تنظیمات‌;
-Keywords[fi]=kaddressbook; aseta; asetukset;
-Keywords[fr]=carnet d'adresses;adresses;kab;kaddressbook;configurer;paramètres;paramètre;
-Keywords[fy]=adresboek;KAB;kab;kaddressbook;ynstellings;configuratie;
-Keywords[ga]=kaddressbook; cumraigh; cumraíocht; socruithe;
-Keywords[gl]=kaddressbook; configurar; opcións;
-Keywords[hi]=केएड्रेसबुक; कॉन्फ़िगर; विन्यास ;
-Keywords[hu]=kaddressbook; konfigurálás; beállítások;
-Keywords[is]=kaddressbook; stillingar; stilla;
-Keywords[it]=kaddressbook; configura; impostazioni;
-Keywords[ja]=kaddressbook 設定;
-Keywords[km]=kaddressbook;កំណត់រចនាសម្ព័ន្ធ;ការកំណត់;
-Keywords[lt]=kaddressbook; configure; settings; konfigūravimas; nustatymai;
-Keywords[mk]=kaddressbook; configure; settings; КАдресар; конфигурирање; конфигурација; поставување;
-Keywords[ms]=;selaraskan; tetapan; kaddressbook; configure; settings;
-Keywords[nb]=kaddressbook; sette opp; innstillinger;
-Keywords[nds]=KAddressbook;KAdressbook;Adressbook;instellen;
-Keywords[ne]=केडीई ठेगाना पुस्तिका; कन्फिगर; सेटिङ;
-Keywords[nl]=adresboek;KAB;kab;kaddressbook;instellingen;configuratie;
-Keywords[nn]=adressebok; oppsett; innstillingar;
-Keywords[pl]=kaddressbook; książka adresowa;adresy;konfiguracja;ustawienia;opcje;
-Keywords[pt]=kaddressbook; configurar; configuração;
-Keywords[pt_BR]=kaddressbook; configurar; configurações;
-Keywords[ro]=kaddressbook;configurare;setări;
-Keywords[ru]=kaddressbook;адресная книга;настройка;
-Keywords[se]=čujuhusgirji;heivehus;heivehusat;
-Keywords[sl]=kaddressbook; adresar; nastavi; nastavitve;
-Keywords[sr]=kaddressbook; configure; settings; подеси; поставке;
-Keywords[sr@Latn]=kaddressbook; configure; settings; podesi; postavke;
-Keywords[sv]=adressbok; anpassa; inställningar;
-Keywords[ta]=கேமுகவரிப்புத்தகம்;கட்டமைப்பு;அமைவுகள்;
-Keywords[tg]=kaddressbook;китоби адрес;танзимот;
-Keywords[tr]=kadresdefteri; yapılandırma; ayarlar;
-Keywords[uk]=kaddressbook; налаштування; параметри;
-Keywords[uz]=kaddressbook; мослаш; мосламалар; манзиллар дафтари;
-Keywords[zh_CN]=kaddressbook; configure; settings; 配置; 设置;
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index b41bdf84..07574e56 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -59,7 +59,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
   TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
                                             KDialog::spacingHint() );
 
-  TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
+  TQGroupBox *groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "General" ), generalPage );
   TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() );
   boxLayout->setAlignment( TQt::AlignTop );
 
@@ -96,7 +96,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
 
   layout->addWidget( groupBox );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Script-Hooks" ), generalPage );
   TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2,
                                        KDialog::spacingHint() );
   label = new TQLabel( i18n( "Phone:" ), groupBox );
@@ -126,7 +126,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
 
   layout->addWidget( groupBox );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Location Map" ), generalPage );
   boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() );
   boxLayout->setAlignment( TQt::AlignTop );
 
@@ -141,22 +141,22 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
   boxLayout->addWidget( mLocationMapURL );
   layout->addWidget( groupBox );
 
-  connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
-  connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
-  connect( mTradeAsFamilyName, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
-  connect( mLimitContactDisplay, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
-  connect( mPhoneHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
-  connect( mSMSHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
-  connect( mFaxHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
-  connect( mLocationMapURL, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
-  connect( mEditorCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( modified() ) );
+  connect( mNameParsing, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
+  connect( mViewsSingleClickBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
+  connect( mTradeAsFamilyName, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
+  connect( mLimitContactDisplay, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
+  connect( mPhoneHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+  connect( mSMSHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+  connect( mFaxHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+  connect( mLocationMapURL, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+  connect( mEditorCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( modified() ) );
 
   tabWidget->addTab( generalPage, i18n( "General" ) );
 
   // Addressee page
   mAddresseeWidget = new AddresseeWidget( this );
   tabWidget->addTab( mAddresseeWidget, i18n( "Contact" ) );
-  connect( mAddresseeWidget, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) );
+  connect( mAddresseeWidget, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) );
 }
 
 void KABConfigWidget::restoreSettings()
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index 5ee3c789..5d6c0506 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -38,7 +38,7 @@ class AddresseeWidget;
 
 class KABConfigWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kaddressbook/kcmconfigs/kabcustomfields.desktop b/kaddressbook/kcmconfigs/kabcustomfields.desktop
index 0df0ccf6..28e77ff8 100644
--- a/kaddressbook/kcmconfigs/kabcustomfields.desktop
+++ b/kaddressbook/kcmconfigs/kabcustomfields.desktop
@@ -12,149 +12,7 @@ X-TDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
 X-TDE-CfgDlgHierarchy=KAB
 
 Name=Custom Pages
-Name[af]=Pasmaak Blaaie
-Name[ar]=الصفحات المعتادة
-Name[bg]=Потребителски полета
-Name[br]=Pajennoù dre ziouer
-Name[bs]=Vlastite stranice
-Name[ca]=Pàgines a mida
-Name[cs]=Vlastní stránky
-Name[da]=Brugervalgte sider
-Name[de]=Benutzerdefinierte Seiten
-Name[el]=Προσαρμοσμένες σελίδες
-Name[eo]=Propraj Paĝoj
-Name[es]=Páginas personalizadas
-Name[et]=Omaloodud leheküljed
-Name[eu]=Orri pertsonalizatuak
-Name[fa]=صفحات سفارشی
-Name[fi]=Omat sivut
-Name[fr]=Pages personnalisées
-Name[fy]=Oanpaste siden
-Name[ga]=Leathanaigh Shaincheaptha
-Name[gl]=Páxinas Personalizadas
-Name[he]=דפים מותאמים אישית
-Name[hu]=Egyéni lapok
-Name[is]=Sérsniðnar síður
-Name[it]=Pagine personalizzate
-Name[ja]=カスタムページ
-Name[kk]=Қосымша парақтар
-Name[km]=ទំព័រផ្ទាល់ខ្លួន
-Name[lt]=Pasirinkti puslapiai
-Name[mk]=Сопствени страници
-Name[ms]=Halaman Kebiasaan 
-Name[nb]=Tilpassede sider
-Name[nds]=Egen Sieden
-Name[ne]=अनुकूल पृष्ठ
-Name[nl]=Aangepaste pagina's
-Name[nn]=Tilpassa sider
-Name[pl]=Własne strony
-Name[pt]=Páginas Personalizadas
-Name[pt_BR]=Páginas personalizadas
-Name[ru]=Дополнительные поля
-Name[se]=Iežat siiddut
-Name[sk]=Vlastné stránky
-Name[sl]=Prilagojene strani
-Name[sr]=Посебне странице
-Name[sr@Latn]=Posebne stranice
-Name[sv]=Egna sidor
-Name[ta]=தனிபயன் பக்கங்கள்
-Name[tg]=Варақаҳои замимавии истифодашаванда
-Name[tr]=Özel Sayfa
-Name[uk]=Нетипові сторінки
-Name[zh_CN]=定制页
+
 Comment=Configure the Custom Pages
-Comment[af]=Stel die pasmaak blaaie op
-Comment[ar]=إعداد الصفحات المعتادة
-Comment[bg]=Настройки на потребителските полета
-Comment[br]=Kefluniañ ar pajennoù diouzhoc'h
-Comment[bs]=Podesite vlastite stranice
-Comment[ca]=Configura les pàgines a mida
-Comment[cs]=Nastavení vlastních stránek
-Comment[da]=Indstil de selvvalgte sider
-Comment[de]=Einstellungen für benutzerdefinierte Seiten
-Comment[el]=Ρύθμιση των προσαρμοσμένων σελίδων
-Comment[eo]=Agordi la proprajn paĝojn
-Comment[es]=Configura las páginas personalizadas
-Comment[et]=Omaloodud lehekülgede seadistamine
-Comment[eu]=Konfiguratu orri pertsonalizatuak
-Comment[fa]=پیکربندی صفحات سفارشی
-Comment[fi]=Muokkaa omia sivuja
-Comment[fr]=Configurer les pages personnalisées
-Comment[fy]=Hjir kinne jo de oanpaste siden ynstelle
-Comment[ga]=Cumraigh na Leathanaigh Shaincheaptha
-Comment[gl]=Configurar as Páxinas Personalizadas
-Comment[he]=הגדר את הדפים המותאמים אישית
-Comment[hu]=Az egyéni lapok beállítása
-Comment[is]=Stilla sérsniðnu síðurnar
-Comment[it]=Configura le pagine personalizzate
-Comment[ja]=カスタムページの設定
-Comment[kk]=Қосымша парақтарды баптау
-Comment[km]=កំណត់រចនាសម្ព័ន្ធទំព័រផ្ទាល់ខ្លួន
-Comment[lt]=Konfigūruoti darbastalių skaičių ir pavadinimus
-Comment[mk]=Конфигурирајте ги сопствените страници
-Comment[ms]=Konfigurkan Halaman Langganan 
-Comment[nb]=Stille inn de tilpassede sidene
-Comment[nds]=Egen Sieden instellen
-Comment[ne]=अनुकूल पृष्ठ कन्फिगर गर्नुहोस्
-Comment[nl]=Hier kunt u de aangepaste pagina's instellen
-Comment[nn]=Set opp dei tilpassa sidene
-Comment[pl]=Konfiguracja własnych stron
-Comment[pt]=Configurar as Páginas Personalizadas
-Comment[pt_BR]=Configurar Páginas personalizadas
-Comment[ru]=Настройка пользовательских вкладок
-Comment[se]=Heivet iežat siidduid
-Comment[sk]=Nastavenie vlastných stránok
-Comment[sl]=Nastavi prilagojene strani
-Comment[sr]=Подешавање посебних страница
-Comment[sr@Latn]=Podešavanje posebnih stranica
-Comment[sv]=Anpassa egna sidor
-Comment[ta]=தனிபயன் பக்கங்களை கட்டமை
-Comment[tg]=Танзимоти варақаҳои замимавии истифодашаванда
-Comment[tr]=Özel Sayfaları Yapılandır
-Comment[uk]=Налаштування нетипових сторінок
-Comment[zh_CN]=配置定制页
-Comment[zh_TW]=設定 Custom Pages
+
 Keywords=kaddressbook; configure; settings; custom fields;
-Keywords[bg]=адресник; потребителски; полета; настройки; настройване; kaddressbook; configure; settings; custom fields;
-Keywords[bs]=kaddressbook; configure; settings; custom fields; podesite; postavke; vlastite; vlastito;
-Keywords[ca]=llibreta d'adreces; configura; opcions; camps a mida;
-Keywords[cs]=kniha adres;nastavení;vlastní pole;
-Keywords[da]=kaddressbook; indstil; opsætning; brugervalgte felter;
-Keywords[de]=KAddressbook;Konfigurieren;Einstellungen;benutzerdefinierte Felder;Einrichten ;
-Keywords[el]=kaddressbook; ρύθμιση; ρυθμίσεις; προσαρμοσμένα πεδία;
-Keywords[es]=kaddressbook; configurar; opciones; campos personalizados;
-Keywords[et]=kde aadressiraamat; seadistamine; seadistused; omaloodud väljad;
-Keywords[eu]=kaddressbook; konfiguratu; ezarpenak; eremu pertsonalizatuak;
-Keywords[fa]=kaddresAPsbook، پیکربندی، تنظیمات، حوزه‌های سفارشی‌;
-Keywords[fi]=osoitekirja; aseta; asetukset; omat kentät;
-Keywords[fr]=carnet d'adresses;adresses;kab;kaddressbook;configurer;paramètres;paramètre;champ;personnalisé;
-Keywords[fy]=adresboek;KAB;kab;kaddressbook;ynstellings;konfiguraasje;oanpaste fjilden;
-Keywords[ga]=kaddressbook; cumraith; cumraíocht; socruithe; réimsí saincheaptha;
-Keywords[gl]=kaddressbook; configurar; opcións; campos personalizados;
-Keywords[hu]=kaddressbook; beállítás; beállítások; egyéni mezők;
-Keywords[is]=kaddressbook; stillingar; stilla; sérsniðnir reitir;
-Keywords[it]=kaddressbook; configura; impostazioni; campi personalizzati;
-Keywords[ja]=kaddressbook、設定、設定;カスタムフィールド;
-Keywords[km]=kaddressbook;កំណត់រចនាសម្ព័ន្ធ;ការកំណត់;វាលផ្ទាល់ខ្លួន;
-Keywords[lt]=kaddressbook; configure; settings; custom fields; pasirinkti laukai;konfigūruoti; nustatymai;
-Keywords[mk]=kaddressbook; configure; settings; custom fields; КАдресар; конфигурација; конфигурирање; сопствени полиња;
-Keywords[ms]=kaddressbook; konfigur; seting; medan kebiasaan;
-Keywords[nb]=kaddressbook; sette opp; innstillinger;
-Keywords[nds]=KAddressbook;KAdressbook;Adressbook;instellen;egen Feller;
-Keywords[ne]=केडीई ठेगाना पुस्तिका; कन्फिगर; सेटिङ; अनुकूल फिल्ड;
-Keywords[nl]=adresboek;KAB;kab;kaddressbook;instellingen;configuratie;aangepaste velden;
-Keywords[nn]=adressebok; oppsett; innstillingar; tilpassa felt;
-Keywords[pl]=kaddressbook;książka adresowa;konfiguracja;ustawienia; własne pola;
-Keywords[pt]=kaddressbook; configurar; configuração; campos personalizados;
-Keywords[pt_BR]=kaddressbook;configurar;configurações; campos personalizados;
-Keywords[ru]=kaddressbook;адресная книга;настройка;
-Keywords[sk]=kaddressbook;nastavenie;vlastné polia;
-Keywords[sl]=kaddressbook; adresar; nastavi; nastavitve; polja; prilagojena;
-Keywords[sr]=kaddressbook; подеси; поставке; посебна поља;
-Keywords[sr@Latn]=kaddressbook; podesi; postavke; posebna polja;
-Keywords[sv]=adressbok; anpassa; inställningar; egna fält;
-Keywords[ta]=கேமுகவரிப்புத்தகம்;கட்டமை; அமைவுகள்; தனிபயன் புலங்கள்;
-Keywords[tg]=kaddressbook;китоби адрес;танзимот;
-Keywords[tr]=kaddressbook;adres defteri;yapılandır;yapılandırma;özel alanlar;
-Keywords[uk]=kaddressbook; налаштування; параметри; нетипові поля;
-Keywords[zh_CN]=kaddressbook; configure; settings; custom fields; 配置; 设置; 定制项;
diff --git a/kaddressbook/kcmconfigs/kabldapconfig.desktop b/kaddressbook/kcmconfigs/kabldapconfig.desktop
index 663d9622..76eb1c55 100644
--- a/kaddressbook/kcmconfigs/kabldapconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabldapconfig.desktop
@@ -12,155 +12,7 @@ X-TDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
 X-TDE-CfgDlgHierarchy=KAB
 
 Name=LDAP Lookup
-Name[af]=LDAP Opkyk
-Name[ar]=البحث في LDAP
-Name[bg]=Търсене в LDAP
-Name[br]=Klask LDAP
-Name[bs]=LDAP pretraga
-Name[ca]=Recerca LDAP
-Name[cs]=LDAP vyhledávání
-Name[cy]=Chwiliad LDAP
-Name[da]=LDAP-Opslag
-Name[de]=LDAP-Nachschlagefunktion
-Name[el]=Αναζήτηση LDAP
-Name[eo]=LDAP-Serĉo
-Name[es]=Búsqueda LDAP
-Name[et]=LDAP otsing
-Name[eu]=LDAP bilaketa
-Name[fa]=مراجعه به LDAP
-Name[fi]=LDAP-haku
-Name[fr]=Consultation LDAP
-Name[fy]=LDAP-sykasksje
-Name[ga]=Cuardach LDAP
-Name[gl]=Procura LDAP
-Name[hi]=एलडीएपी तलाश
-Name[hu]=LDAP-lekérdezés
-Name[is]=LDAP uppfletting
-Name[it]=Ricerca LDAP
-Name[ja]=LDAP 検索
-Name[kk]=LDAP іздеу
-Name[km]=ស្វែងរក LDAP
-Name[lt]=LDAP paieška
-Name[mk]=Пребарување во LDAP
-Name[nb]=LDAP oppslag
-Name[nds]=LDAP-Naslaan
-Name[ne]=एलडीएपी खोजी गर्नुहोस्
-Name[nl]=LDAP-zoekactie
-Name[nn]=LDAP oppslag
-Name[pa]=LDAP ਖੋਜ
-Name[pl]=Wyszukiwanie LDAP
-Name[pt]=Pesquisa na LDAP
-Name[pt_BR]=Procura LDAP
-Name[ro]=Căutare LDAP
-Name[ru]=Каталоги LDAP
-Name[sk]=LDAP hľadanie
-Name[sl]=Vpogled v LDAP
-Name[sr]=LDAP потрага
-Name[sr@Latn]=LDAP potraga
-Name[sv]=LDAP-uppslagning
-Name[ta]=LDAP லுக்கப்
-Name[tg]=Ҷустуҷӯ дар каталогҳои LDAP
-Name[tr]=LDAP Tarama
-Name[uk]=Пошук через LDAP
-Name[zh_CN]=LDAP 查询
+
 Comment=Configure the Address Book LDAP Settings
-Comment[af]=Stel die adres boek se LDAP opstelling op.
-Comment[bg]=Настройки на адресника за използване на сървър LDAP
-Comment[bs]=Podesite LDAP postavke Adresara
-Comment[ca]=Configura les opcions de la Llibreta d'adreces LDAP
-Comment[cs]=Nastavit LDAP pro Knihu adres
-Comment[cy]=Ffurfweddu gosodiadau LDAP y Llyfr Cyfeiriadau
-Comment[da]=Indstil adressebogens LDAP-opsætning
-Comment[de]=Adressbuch-Modul für LDAP-Einstellungen
-Comment[el]=Αλλάξτε τις ρυθμίσεις LDAP του Βιβλίου διευθύνσεων
-Comment[eo]=Agordo de tenejo
-Comment[es]=Configura las opciones de búsqueda LDAP en la libreta de direcciones
-Comment[et]=Aadressiraamatu LDAP seadistused
-Comment[eu]=Konfiguratu Helbide-liburuaren LDAP ezarpenak
-Comment[fa]=پیکربندی تنظیمات LDAP کتاب نشانی‌
-Comment[fi]=Aseta osoitekirjan LDAP-asetuksia
-Comment[fr]=Configurer les paramètres du carnet d'adresses LDAP
-Comment[fy]=Hjir kinne jo de LDAP-ynstellings foar jo adresboek ynstelle
-Comment[gl]=Configurar as opcións do Caderno de Enderezos de LDAP
-Comment[he]=הגדר את פנקס הכתובות מבוסס LDAP
-Comment[hi]=पता पुस्तिका एलडीएपी विन्यास कॉन्फ़िगर करें
-Comment[hu]=A címjegyzék LDAP-beállításainak megváltoztatása
-Comment[is]=Breyta LDAP stillingum vistfangaskráarinnar
-Comment[it]=Configurare le impostazioni LDAP della rubrica indirizzi
-Comment[ja]=アドレス帳 LDAP 設定
-Comment[kk]=Адрестік кітапшаның LDAP параметрлерін баптау
-Comment[km]=កំណត់រចនាសម្ព័ន្ធការកំណត់ LDAP របស់សៀវភៅអាសយដ្ឋាន
-Comment[lt]=Konfigūruoti adresų knygelės LDAP nustatymus
-Comment[mk]=Конфигурирајте ги поставувањата за LDAP за адресарот
-Comment[ms]=Konfigurkan Seting Buku Alamat  LDAP 
-Comment[nb]=Sett opp LDAP-innstillinger for adresseboka
-Comment[nds]=LDAP-Instellen för KAdressbook
-Comment[ne]=ठेगाना पुस्तिका एलडीएपी सेटिङ कन्फिगर गर्नुहोस्
-Comment[nl]=Hier kunt u de LDAP-instellingen voor uw adresboek instellen
-Comment[nn]=Setja opp LDAP-innstillingar for adresseboka
-Comment[pl]=Konfiguracja ustawień LDAP dla Książki adresowej
-Comment[pt]=Configurar as opções de LDAP do Livro de Endereços
-Comment[pt_BR]=Configurar as Definições para LDAP do Livro de Endereços
-Comment[ru]=Настройка серверов LDAP адресной книги
-Comment[sk]=Nastavenie LDAP volieb Adresára
-Comment[sl]=Prilagodi nastavitve LDAP v Adresarju
-Comment[sr]=Подешавање LDAP поставки адресара
-Comment[sr@Latn]=Podešavanje LDAP postavki adresara
-Comment[sv]=Anpassa adressbokens LDAP-inställningar
-Comment[ta]=கேமுகவரிபுத்தகத்தை உருவமை LDAP அமைவுகள்
-Comment[tg]=Танзимоти серверҳои LDAP-и китоби адрес
-Comment[tr]=Adres Defteri LDAP Ayarlarını Yapılandır
-Comment[uk]=Налаштування параметрів LDAP для адресної книги
-Comment[uz]=LDAP манзиллар дафтарини мослаш
-Comment[zh_CN]=配置地址簿 LDAP 设置
-Comment[zh_TW]=設定通訊錄 LDAP 設定
+
 Keywords=kaddressbook; configure; settings; LDAP;
-Keywords[be]=K Адрасная кніга; настроіць; настраўленні; kaddressbook; configure; settings; LDAP;
-Keywords[bg]=адресник;адрес;адресна;книга;сървър;всички;kaddressbook; configure; settings; LDAP;
-Keywords[br]=kaddressbook; kefluniañ; dibarzhoù; LDAP;
-Keywords[bs]=kaddressbook; configure; settings; LDAP; podesi; postavke; podesite; konfiguracija;
-Keywords[ca]=llibreta d'adreces; configura; opcions; LDAP;
-Keywords[cs]=kniha adres;nastavení;LDAP;
-Keywords[cy]=kaddressbook;ffurfweddu; gosodiadau;LDAP;
-Keywords[da]=kaddressbook; indstil; opsætning; LDAP;
-Keywords[de]=KAddressbook;LDAP;Einstellungen; Einrichten;
-Keywords[el]=kaddressbook; ρύθμιση; ρυθμίσεις; LDAP;
-Keywords[es]=kaddressbook; configurar; opciones; LDAP;
-Keywords[et]=kde aadressiraamat; seadistamine; seadistused; LDAP;
-Keywords[eu]=kaddressbook; konfiguratu;ezarpenak; LDAP;
-Keywords[fa]=kaddressbook، پیکربندی، تنظیمات، LDAP;
-Keywords[fi]=kaddressbook; aseta; asetukset; LDAP;
-Keywords[fr]=carnet d'adresses;adresses;kab;kaddressbook;configurer;paramètres;paramètre;LDAP;
-Keywords[fy]=adresboek;kaddressbook;LDAP;
-Keywords[ga]=kaddressbook; cumraigh; cumraíocht; socruithe; LDAP;
-Keywords[gl]=kaddressbook; configurar;opcións; LDAP;
-Keywords[hi]=केएड्रेसबुक; कॉन्फ़िगर; विन्यास;एलडीएपी;
-Keywords[hu]=kaddressbook; konfiguráció; beállítások; LDAP;
-Keywords[is]=kaddressbook; stillingar; stilla; LDAP;
-Keywords[it]=kaddressbook; configura; impostazioni; LDAP;
-Keywords[ja]=kaddressbook LDAP 設定;
-Keywords[km]=kaddressbook;កំណត់រចនាសម្ព័ន្ធ;ការកំណត់;LDAP;
-Keywords[lt]=kaddressbook; configure; settings; LDAP; nustatymai; konfigūruoti;
-Keywords[mk]=kaddressbook; configure; settings; LDAP; кадресар; конфигурација; конфигурирање; поставувања;
-Keywords[ms]=selaraskan; tetapan; kaddressbook; configure; settings; LDAP;
-Keywords[nb]=kaddressbook; sette opp; innstillinger; LDAP;
-Keywords[nds]=KAdressbook;Adressbook;LDAP;instellen;
-Keywords[ne]=केडीई ठेगाना पुस्तिका; कन्फिगर; सेटिङ; एलडीएपी;
-Keywords[nl]=adresboek;kaddressbook;LDAP;
-Keywords[nn]=adressebok; oppsett; innstillingar; LDAP;
-Keywords[pl]=kaddressbook; książka adresowa;konfiguracja;ustawienia;opcje; LDAP;
-Keywords[pt]=kaddressbook; configurar; configuração; LDAP;
-Keywords[pt_BR]=kaddressbook; configurar; configurações; LDAP;
-Keywords[ro]=kaddressbook;configurare;setări;LDAP;
-Keywords[ru]=kaddressbook; configure; settings; LDAP; адресная книга; настройки;
-Keywords[se]=čujuhusgirji;heivehus;heivehit;LDAP;
-Keywords[sl]=kaddressbook;adresar; nastavi; nastavitve; LDAP;
-Keywords[sr]=kaddressbook; configure; settings; подеси; поставке; LDAP;
-Keywords[sr@Latn]=kaddressbook; configure; settings; podesi; postavke; LDAP;
-Keywords[sv]=adressbok; anpassa; inställningar; LDAP;
-Keywords[ta]=கேமுகவரிபுத்தகம்;கட்டமைப்பு;அமைவுகள்;LDAP;
-Keywords[tg]=kaddressbook; configure; settings; LDAP; китоби адрес; танзимот;
-Keywords[tr]=adres defteri;yapılandırma;ayarlar;LDAP;
-Keywords[uk]=kaddressbook; налаштування; параметри; LDAP;
-Keywords[uz]=kaddressbook; мослаш; мосламалар; манзиллар дафтари; LDAP;
-Keywords[zh_CN]=kaddressbook; configure; settings; LDAP; 配置; 设置;
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index db05432c..ca6b5da4 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -31,11 +31,11 @@
 
 #include "kcmkabconfig.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_kabconfig( TQWidget *parent, const char * ) {
+  TDE_EXPORT TDECModule *create_kabconfig( TQWidget *parent, const char * ) {
     return new KCMKabConfig( parent, "kcmkabconfig" );
   }
 }
@@ -47,7 +47,7 @@ KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
   mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
   layout->addWidget( mConfigWidget );
 
-  connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
+  connect( mConfigWidget, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) );
 
   load();
 
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h
index b4b18b0e..d97eb1d8 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.h
@@ -30,7 +30,7 @@ class KABConfigWidget;
 
 class KCMKabConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
index dcbcd2c5..c1a6db97 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
@@ -29,11 +29,11 @@
 
 #include <tqregexp.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_kabcustomfields( TQWidget *parent, const char * ) {
+  TDE_EXPORT TDECModule *create_kabcustomfields( TQWidget *parent, const char * ) {
     return new KCMKabCustomFields( parent, "kcmkabcustomfields" );
   }
 }
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index 73e8c5a2..60e47b27 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -32,11 +32,11 @@
 
 #include "kcmkabldapconfig.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_kabldapconfig( TQWidget *parent, const char * ) {
+  TDE_EXPORT TDECModule *create_kabldapconfig( TQWidget *parent, const char * ) {
     return new KCMKabLdapConfig( parent, "kcmkabldapconfig" );
   }
 }
@@ -48,7 +48,7 @@ KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
   mConfigWidget = new LDAPOptionsWidget( this );
   layout->addWidget( mConfigWidget );
 
-  connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
+  connect( mConfigWidget, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) );
 
   load();
 
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
index 2e823814..9ea25e83 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
@@ -32,7 +32,7 @@ class LDAPOptionsWidget;
 
 class KCMKabLdapConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 4e4b15a9..f8bcfdb9 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -80,14 +80,14 @@ LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* parent,  const char* name )
   mHostListView->addColumn( TQString() );
   mHostListView->header()->hide();
 
-  connect( mHostListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
-           TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) );
-  connect( mHostListView, TQT_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(slotEditHost()));
-  connect( mHostListView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
-           TQT_SLOT( slotItemClicked( TQListViewItem* ) ) );
-
-  connect( mUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveUp() ) );
-  connect( mDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveDown() ) );
+  connect( mHostListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+           TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) );
+  connect( mHostListView, TQ_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT(slotEditHost()));
+  connect( mHostListView, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+           TQ_SLOT( slotItemClicked( TQListViewItem* ) ) );
+
+  connect( mUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUp() ) );
+  connect( mDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDown() ) );
 }
 
 LDAPOptionsWidget::~LDAPOptionsWidget()
@@ -288,10 +288,10 @@ void LDAPOptionsWidget::initGUI()
   layout->addWidget( groupBox );
 
   KButtonBox *buttons = new KButtonBox( this );
-  buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) );
-  mEditButton = buttons->addButton( i18n( "&Edit Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotEditHost() ) );
+  buttons->addButton( i18n( "&Add Host..." ), this, TQ_SLOT( slotAddHost() ) );
+  mEditButton = buttons->addButton( i18n( "&Edit Host..." ), this, TQ_SLOT( slotEditHost() ) );
   mEditButton->setEnabled( false );
-  mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) );
+  mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQ_SLOT( slotRemoveHost() ) );
   mRemoveButton->setEnabled( false );
   buttons->layout();
 
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.h b/kaddressbook/kcmconfigs/ldapoptionswidget.h
index 5471b0b6..fbb32a1f 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.h
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.h
@@ -33,7 +33,7 @@ class TQPushButton;
 
 class LDAPOptionsWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public: