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, 6 insertions, 5 deletions

diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h
index 91f3d1aee..03318737d 100644
--- a/libkcal/resourcecalendar.h
+++ b/libkcal/resourcecalendar.h
@@ -57,6 +57,7 @@ class CalFormat;
 class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     ResourceCalendar( const KConfig * );
     virtual ~ResourceCalendar();
@@ -385,10 +386,10 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
     virtual bool removeSubresource( const TQString& resource );
 
     /**
-     * Add a subresource with the name @param resource and the parent
-     * id @param parent.
+     * Add a subresource with the name @param resource and the tqparent
+     * id @param tqparent.
      */
-    virtual bool addSubresource( const TQString& resource, const TQString& parent );
+    virtual bool addSubresource( const TQString& resource, const TQString& tqparent );
 
     /**
      * Returns the type of the subresource: "event", "todo" or "journal",
@@ -440,11 +441,11 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
     /**
       A resource should call this function if a load error happens.
     */
-    void loadError( const TQString &errorMessage = TQString::null );
+    void loadError( const TQString &errorMessage = TQString() );
     /**
       A resource should call this function if a save error happens.
     */
-    void saveError( const TQString &errorMessage = TQString::null );
+    void saveError( const TQString &errorMessage = TQString() );
 
   private:
     bool mReceivedLoadError;