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

1 files changed, 13 insertions, 12 deletions

diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index d8b83c40..9b41850f 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: