Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

17 files changed, 90 insertions, 82 deletions

diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp
index c09e5b945..a6174dffd 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.cpp
+++ b/kaddressbook/kcmconfigs/addhostdialog.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlabel.h>
@@ -33,8 +33,8 @@
 #include <klocale.h>
 #include "addhostdialog.h"
 
-AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent,  const char* name )
-  : KDialogBase( Plain, i18n( "Add Host" ), Ok | Cancel, Ok, parent, name, true, true )
+AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* tqparent,  const char* name )
+  : KDialogBase( Plain, i18n( "Add Host" ), Ok | Cancel, Ok, tqparent, name, true, true )
 {
   mServer = server;
 
diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h
index 702bb323b..956892d9f 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.h
+++ b/kaddressbook/kcmconfigs/addhostdialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ADDHOSTDIALOG_H
@@ -35,9 +35,10 @@ class TQSpinBox;
 class AddHostDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AddHostDialog( KPIM::LdapServer* server, TQWidget* parent = 0, const char* name = 0 );
+    AddHostDialog( KPIM::LdapServer* server, TQWidget* tqparent = 0, const char* name = 0 );
     ~AddHostDialog();
 
   signals:
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index a7d9ebe6f..b68e96c67 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcstring.h>
@@ -41,12 +41,12 @@
 #include "addresseewidget.h"
 
 NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
-                                TQWidget *parent, const char *name )
-  : TQWidget( parent, name ), mTitle( title ), mLabel( label )
+                                TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name ), mTitle( title ), mLabel( label )
 {
   TQHBoxLayout *tqlayout = 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->tqlayout(), 2, 2,
                                               KDialog::spacingHint() );
 
@@ -55,7 +55,7 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
            TQT_SLOT( selectionChanged( TQListBoxItem* ) ) );
   groupLayout->addWidget( mBox, 0, 0 );
 
-  KButtonBox *bbox = new KButtonBox( group, Qt::Vertical );
+  KButtonBox *bbox = new KButtonBox( group, TQt::Vertical );
   mAddButton = bbox->addButton( i18n( "Add..." ), this,  TQT_SLOT( add() ) );
   mEditButton = bbox->addButton( i18n( "Edit..." ), this,  TQT_SLOT( edit() ) );
   mEditButton->setEnabled( false );
@@ -91,7 +91,7 @@ void NamePartWidget::add()
   bool ok;
 
   TQString namePart = KInputDialog::getText( i18n( "New" ), mLabel,
-                                            TQString::null, &ok );
+                                            TQString(), &ok );
   if ( ok && !namePart.isEmpty() ) {
     mBox->insertItem( namePart );
     emit modified();
@@ -131,8 +131,8 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item )
 
 
 
-AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+AddresseeWidget::AddresseeWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
diff --git a/kaddressbook/kcmconfigs/addresseewidget.h b/kaddressbook/kcmconfigs/addresseewidget.h
index b8bbf217e..8c81ac23d 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.h
+++ b/kaddressbook/kcmconfigs/addresseewidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef ADDRESSEEWIDGET_H
@@ -33,12 +33,13 @@ class TQListBox;
 class TQListBoxItem;
 class TQPushButton;
 
-class NamePartWidget : public QWidget
+class NamePartWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    NamePartWidget( const TQString &title, const TQString &label, TQWidget *parent,
+    NamePartWidget( const TQString &title, const TQString &label, TQWidget *tqparent,
                     const char *name = 0 );
     ~NamePartWidget();
 
@@ -65,12 +66,13 @@ class NamePartWidget : public QWidget
     TQString mLabel;
 };
 
-class AddresseeWidget : public QWidget
+class AddresseeWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AddresseeWidget( TQWidget *parent, const char *name = 0 );
+    AddresseeWidget( TQWidget *tqparent, const char *name = 0 );
     ~AddresseeWidget();
 
     void restoreSettings();
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
index 0758f320c..62716886b 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -30,8 +30,8 @@
 #include "extensionwidget.h"
 
 ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
-                                              TQWidget *parent, const char *name )
-  : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, parent,
+                                              TQWidget *tqparent, const char *name )
+  : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, tqparent,
                  name, true, true ), mWidget( 0 ), mConfig( config )
 {
   TQFrame *page = plainPage();
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.h b/kaddressbook/kcmconfigs/extensionconfigdialog.h
index 34339fa01..de5f506b8 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.h
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef EXTENSIONCONFIGDIALOG_H
@@ -35,10 +35,11 @@ class ConfigureWidget;
 class ExtensionConfigDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
-                           TQWidget *parent, const char *name = 0 );
+                           TQWidget *tqparent, const char *name = 0 );
     ~ExtensionConfigDialog();
 
   protected slots:
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index d1888624e..c65255db4 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcheckbox.h>
@@ -45,8 +45,8 @@
 
 #include "kabconfigwidget.h"
 
-KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0,
                                             KDialog::spacingHint() );
@@ -59,9 +59,9 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
   TQVBoxLayout *tqlayout = 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->tqlayout() );
-  boxLayout->tqsetAlignment( Qt::AlignTop );
+  boxLayout->tqsetAlignment( TQt::AlignTop );
 
   mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" );
   boxLayout->addWidget( mViewsSingleClickBox );
@@ -96,7 +96,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
 
   tqlayout->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->tqlayout(), 3, 2,
                                        KDialog::spacingHint() );
   label = new TQLabel( i18n( "Phone:" ), groupBox );
@@ -126,9 +126,9 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
 
   tqlayout->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->tqlayout(), KDialog::spacingHint() );
-  boxLayout->tqsetAlignment( Qt::AlignTop );
+  boxLayout->tqsetAlignment( TQt::AlignTop );
 
   mLocationMapURL = new TQComboBox( true, groupBox );
   mLocationMapURL->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index 54cdbf0ee..e169f2ef5 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KABCONFIGWIDGET_H
@@ -36,12 +36,13 @@ class KListView;
 
 class AddresseeWidget;
 
-class KABConfigWidget : public QWidget
+class KABConfigWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KABConfigWidget( TQWidget *parent, const char *name = 0 );
+    KABConfigWidget( TQWidget *tqparent, const char *name = 0 );
 
     void restoreSettings();
     void saveSettings();
diff --git a/kaddressbook/kcmconfigs/kabldapconfig.desktop b/kaddressbook/kcmconfigs/kabldapconfig.desktop
index 2d29acdf0..e007f2b52 100644
--- a/kaddressbook/kcmconfigs/kabldapconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabldapconfig.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=find
+Icon=tqfind
 Type=Service
 ServiceTypes=KCModule
 DocPath=kaddressbook/preferences.html#preferences-ldap-lookup
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index f112c4c89..a504af0bb 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqlayout.h>
@@ -35,13 +35,13 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kabconfig( TQWidget *parent, const char * ) {
-    return new KCMKabConfig( parent, "kcmkabconfig" );
+  KDE_EXPORT KCModule *create_kabconfig( TQWidget *tqparent, const char * ) {
+    return new KCMKabConfig( tqparent, "kcmkabconfig" );
   }
 }
 
-KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+KCMKabConfig::KCMKabConfig( TQWidget *tqparent, const char *name )
+  : KCModule( tqparent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
   mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h
index 5ffecea50..74232946f 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KCMKABCONFIG_H
@@ -31,9 +31,10 @@ class KABConfigWidget;
 class KCMKabConfig : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KCMKabConfig( TQWidget *parent = 0, const char *name = 0 );
+    KCMKabConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
index 3b127eab2..8c0fa7316 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "kcmkabcustomfields.h"
@@ -33,13 +33,13 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *parent, const char * ) {
-    return new KCMKabCustomFields( parent, "kcmkabcustomfields" );
+  KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *tqparent, const char * ) {
+    return new KCMKabCustomFields( tqparent, "kcmkabcustomfields" );
   }
 }
 
-KCMKabCustomFields::KCMKabCustomFields( TQWidget *parent, const char *name )
-  : KCMDesignerFields( parent, name )
+KCMKabCustomFields::KCMKabCustomFields( TQWidget *tqparent, const char *name )
+  : KCMDesignerFields( tqparent, name )
 {
 }
 
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.h b/kaddressbook/kcmconfigs/kcmkabcustomfields.h
index 38cd19a98..4eb30a880 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.h
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KCMKABCUSTOMFIELDS_H
 #define KCMKABCUSTOMFIELDS_H
@@ -28,7 +28,7 @@
 class KCMKabCustomFields : public KPIM::KCMDesignerFields
 {
   public:
-    KCMKabCustomFields( TQWidget *parent = 0, const char *name = 0 );
+    KCMKabCustomFields( TQWidget *tqparent = 0, const char *name = 0 );
 
   protected:
     TQString localUiDir();
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index 4cadf2633..b2f657c87 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcheckbox.h>
@@ -36,13 +36,13 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *parent, const char * ) {
-    return new KCMKabLdapConfig( parent, "kcmkabldapconfig" );
+  KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *tqparent, const char * ) {
+    return new KCMKabLdapConfig( tqparent, "kcmkabldapconfig" );
   }
 }
 
-KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *tqparent, const char *name )
+  : KCModule( tqparent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
   mConfigWidget = new LDAPOptionsWidget( this );
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
index 53d1a21b4..10ec0d211 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KCMKABLDAPCONFIG_H
@@ -33,9 +33,10 @@ class LDAPOptionsWidget;
 class KCMKabLdapConfig : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KCMKabLdapConfig( TQWidget *parent = 0, const char *name = 0 );
+    KCMKabLdapConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 639cec027..e0bbca236 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqgroupbox.h>
@@ -42,11 +42,11 @@
 #include <tqvbox.h>
 #include <kiconloader.h>
 
-class LDAPItem : public QCheckListItem
+class LDAPItem : public TQCheckListItem
 {
   public:
-    LDAPItem( TQListView *parent, const KPIM::LdapServer &server, bool isActive = false )
-      : TQCheckListItem( parent, parent->lastItem(), TQString::null, TQCheckListItem::CheckBox ),
+    LDAPItem( TQListView *tqparent, const KPIM::LdapServer &server, bool isActive = false )
+      : TQCheckListItem( tqparent, tqparent->lastItem(), TQString(), TQCheckListItem::CheckBox ),
         mIsActive( isActive )
     {
       setServer( server );
@@ -69,15 +69,15 @@ class LDAPItem : public QCheckListItem
     bool mIsActive;
 };
 
-LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* parent,  const char* name )
-  : TQWidget( parent, name )
+LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* tqparent,  const char* name )
+  : TQWidget( tqparent, name )
 {
   initGUI();
 
   mHostListView->setSorting( -1 );
   mHostListView->setAllColumnsShowFocus( true );
   mHostListView->setFullWidth( true );
-  mHostListView->addColumn( TQString::null );
+  mHostListView->addColumn( TQString() );
   mHostListView->header()->hide();
 
   connect( mHostListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.h b/kaddressbook/kcmconfigs/ldapoptionswidget.h
index 10f1d90d8..17fbe6e6f 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.h
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef LDAPOPTIONSWIDGET_H
@@ -31,12 +31,13 @@ class KListView;
 class TQListViewItem;
 class TQPushButton;
 
-class LDAPOptionsWidget : public QWidget
+class LDAPOptionsWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    LDAPOptionsWidget( TQWidget* parent = 0, const char* name = 0 );
+    LDAPOptionsWidget( TQWidget* tqparent = 0, const char* name = 0 );
     ~LDAPOptionsWidget();
 
     void restoreSettings();