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

10 files changed, 60 insertions, 56 deletions

diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp
index f82b757fd..1f9325ed0 100644
--- a/kaddressbook/interfaces/configurewidget.cpp
+++ b/kaddressbook/interfaces/configurewidget.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 <kabc/addressbook.h>
@@ -27,9 +27,9 @@
 
 using namespace KAB;
 
-ConfigureWidget::ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent,
+ConfigureWidget::ConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent,
                                   const char *name )
-  : TQWidget( parent, name ), mAddressBook( ab )
+  : TQWidget( tqparent, name ), mAddressBook( ab )
 {
 }
 
diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h
index 0ce35e5c7..89e980084 100644
--- a/kaddressbook/interfaces/configurewidget.h
+++ b/kaddressbook/interfaces/configurewidget.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 KAB_CONFIGUREWIDGET_H
@@ -35,10 +35,10 @@ class AddressBook;
 
 namespace KAB {
 
-class KDE_EXPORT ConfigureWidget : public QWidget
+class KDE_EXPORT ConfigureWidget : public TQWidget
 {
   public:
-    ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    ConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
     ~ConfigureWidget();
 
     /**
diff --git a/kaddressbook/interfaces/contacteditorwidget.cpp b/kaddressbook/interfaces/contacteditorwidget.cpp
index 45b38ef3e..230f8d019 100644
--- a/kaddressbook/interfaces/contacteditorwidget.cpp
+++ b/kaddressbook/interfaces/contacteditorwidget.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 "contacteditorwidget.h"
@@ -26,8 +26,8 @@
 using namespace KAB;
 
 ContactEditorWidget::ContactEditorWidget( KABC::AddressBook *ab,
-                                          TQWidget *parent, const char *name )
-  : TQWidget( parent, name ), mAddressBook( ab ), mModified( false )
+                                          TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name ), mAddressBook( ab ), mModified( false )
 {
 }
 
diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h
index 28a376e77..dc8039b60 100644
--- a/kaddressbook/interfaces/contacteditorwidget.h
+++ b/kaddressbook/interfaces/contacteditorwidget.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 KAB_CONTACTEDITORWIDGET_H
@@ -34,14 +34,15 @@
 
 namespace KAB {
 
-class KDE_EXPORT ContactEditorWidget : public QWidget
+class KDE_EXPORT ContactEditorWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     typedef TQValueList<ContactEditorWidget*> List;
 
-    ContactEditorWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    ContactEditorWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
     ~ContactEditorWidget();
 
     /**
@@ -116,7 +117,7 @@ class KDE_EXPORT ContactEditorWidget : public QWidget
 class ContactEditorWidgetFactory : public KLibFactory
 {
   public:
-    virtual ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent,
+    virtual ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent,
                                                const char *name = 0 ) = 0;
 
     /**
diff --git a/kaddressbook/interfaces/core.cpp b/kaddressbook/interfaces/core.cpp
index 7f7d10481..b604d6564 100644
--- a/kaddressbook/interfaces/core.cpp
+++ b/kaddressbook/interfaces/core.cpp
@@ -17,16 +17,16 @@
     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 "core.h"
 
 using namespace KAB;
 
-Core::Core( KXMLGUIClient *client, TQObject *parent, const char *name )
-  : TQObject( parent, name ), mGUIClient( client )
+Core::Core( KXMLGUIClient *client, TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name ), mGUIClient( client )
 {
 }
 
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index 16fa4c839..b4289249f 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.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 KAB_CORE_H
@@ -52,12 +52,13 @@ namespace KAB {
 
 class SearchManager;
 
-class KDE_EXPORT Core : public QObject
+class KDE_EXPORT Core : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    Core( KXMLGUIClient *client, TQObject *parent, const char *name = 0 );
+    Core( KXMLGUIClient *client, TQObject *tqparent, const char *name = 0 );
 
     /**
       Returns a pointer to the StdAddressBook of the application.
@@ -95,10 +96,10 @@ class KDE_EXPORT Core : public QObject
       resource or a null pointer if no resource was selected by
       the user.
      */
-    virtual KABC::Resource *requestResource( TQWidget *parent ) = 0;
+    virtual KABC::Resource *requestResource( TQWidget *tqparent ) = 0;
 
     /**
-      Returns the parent widget.
+      Returns the tqparent widget.
      */
     virtual TQWidget *widget() const = 0;
 
@@ -187,7 +188,7 @@ class KDE_EXPORT Core : public QObject
     /**
       Shows an edit dialog for the given uid.
      */
-    virtual void editContact( const TQString &uid = TQString::null ) = 0;
+    virtual void editContact( const TQString &uid = TQString() ) = 0;
 
     /**
       Shows an edit dialog for the given distribution list 
diff --git a/kaddressbook/interfaces/extensionwidget.cpp b/kaddressbook/interfaces/extensionwidget.cpp
index 75622935c..bae99b03f 100644
--- a/kaddressbook/interfaces/extensionwidget.cpp
+++ b/kaddressbook/interfaces/extensionwidget.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 "core.h"
@@ -27,9 +27,9 @@
 
 using namespace KAB;
 
-ExtensionWidget::ExtensionWidget( Core *core, TQWidget *parent,
+ExtensionWidget::ExtensionWidget( Core *core, TQWidget *tqparent,
                                   const char *name )
-  : TQWidget( parent, name ), mCore( core )
+  : TQWidget( tqparent, name ), mCore( core )
 {
 }
 
@@ -55,7 +55,7 @@ KABC::Addressee::List ExtensionWidget::selectedContacts()
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt = uids.end();
   for ( it = uids.begin(); it != endIt; ++it )
-    list.append( mCore->addressBook()->tqfindByUid( *it ) );
+    list.append( mCore->addressBook()->findByUid( *it ) );
 
   return list;
 }
diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h
index 52ee946ca..7b3daca9f 100644
--- a/kaddressbook/interfaces/extensionwidget.h
+++ b/kaddressbook/interfaces/extensionwidget.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 KAB_EXTENSIONWIDGET_H
@@ -36,12 +36,13 @@ namespace KAB {
 class Core;
 class ConfigureWidget;
 
-class KDE_EXPORT ExtensionWidget : public QWidget
+class KDE_EXPORT ExtensionWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ExtensionWidget( Core *core, TQWidget *parent, const char *name = 0 );
+    ExtensionWidget( Core *core, TQWidget *tqparent, const char *name = 0 );
     ~ExtensionWidget();
 
     /**
@@ -91,7 +92,7 @@ class KDE_EXPORT ExtensionWidget : public QWidget
 class ExtensionFactory : public KLibFactory
 {
   public:
-    virtual ExtensionWidget *extension( KAB::Core *core, TQWidget *parent,
+    virtual ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent,
                                         const char *name = 0 ) = 0;
 
     virtual ConfigureWidget *configureWidget( TQWidget*, const char* = 0 )
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index 798ebf559..d4f5b2866 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.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 <tqmap.h>
@@ -40,9 +40,9 @@ class XXPort::XXPortPrivate
     KApplication *mKApp;
 };
 
-XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent,
+XXPort::XXPort( KABC::AddressBook *ab, TQWidget *tqparent,
                             const char *name )
-  : TQObject( parent, name ), mAddressBook( ab ), mParentWidget( parent ),
+  : TQObject( tqparent, name ), mAddressBook( ab ), mParentWidget( tqparent ),
     d( new XXPortPrivate )
 {
   setInstance( new KInstance( "kaddressbook" ) );
@@ -117,12 +117,12 @@ void XXPort::processEvents() const
 
 void XXPort::slotExportActivated( const TQString &data )
 {
-  emit exportActivated( identifier(), ( data == "<empty>" ? TQString::null : data ) );
+  emit exportActivated( identifier(), ( data == "<empty>" ? TQString() : data ) );
 }
 
 void XXPort::slotImportActivated( const TQString &data )
 {
-  emit importActivated( identifier(), ( data == "<empty>" ? TQString::null : data ) );
+  emit importActivated( identifier(), ( data == "<empty>" ? TQString() : data ) );
 }
 
 #include "xxport.moc"
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index d8b83c401..9b41850f8 100644
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.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 KAB_XXPORT_H
@@ -45,10 +45,10 @@ class KApplication;
  */
 #define K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libname, XXPortClass, catalog ) \
  class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \
-	KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, const char *name ) \
+	KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) \
 	 { const char *cat = catalog; \
 	   if (cat) KGlobal::locale()->insertCatalogue(cat); \
-	   return new XXPortClass( ab, parent, name ); \
+	   return new XXPortClass( ab, tqparent, name ); \
          } \
  }; \
  K_EXPORT_COMPONENT_FACTORY( libname, localXXPortFactory )
@@ -68,9 +68,10 @@ namespace KAB {
 class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
     ~XXPort();
 
     /**
@@ -94,7 +95,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
     /**
       Processes outstanding KApplication events. It should be called
       occasionally when the import/export filter is busy performing
-      a long operation (e.g. reading from slow external devices).
+      a long operation (e.g. reading from slow external tqdevices).
       @see: TQApplication::processEvents()
      */
     void processEvents() const;
@@ -113,14 +114,14 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
   signals:
     /**
       Emitted whenever the export action is activated.
-      The parameter tqcontains the @ref identifier() for
+      The parameter contains the @ref identifier() for
       unique identification.
      */
     void exportActivated( const TQString&, const TQString& );
 
     /**
       Emitted whenever the import action is activated.
-      The parameter tqcontains the @ref identifier() for
+      The parameter contains the @ref identifier() for
       unique identification.
      */
     void importActivated( const TQString&, const TQString& );
@@ -129,12 +130,12 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
     /**
       Create the import action. The identifier is passed in the import slot.
      */
-    void createImportAction( const TQString &label, const TQString &identifier = TQString::null );
+    void createImportAction( const TQString &label, const TQString &identifier = TQString() );
 
     /**
       Create the export action. The identifier is passed in the export slot.
      */
-    void createExportAction( const TQString &label, const TQString &identifier = TQString::null );
+    void createExportAction( const TQString &label, const TQString &identifier = TQString() );
 
     /**
       Returns a pointer to the address book object.
@@ -142,7 +143,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
     KABC::AddressBook *addressBook() const;
 
     /**
-      Returns a pointer to the parent widget. It can be used as parent for
+      Returns a pointer to the tqparent widget. It can be used as tqparent for
       message boxes.
      */
     TQWidget *tqparentWidget() const;
@@ -162,7 +163,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
 class XXPortFactory : public KLibFactory
 {
   public:
-    virtual XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent,
+    virtual XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *tqparent,
                                   const char *name = 0 ) = 0;
 
   protected: