Rename old tq methods that no longer need a unique name

1 files changed, 15 insertions, 15 deletions

diff --git a/libkcal/scheduler.h b/libkcal/scheduler.h
index ceeace4a1..4d97ab515 100644
--- a/libkcal/scheduler.h
+++ b/libkcal/scheduler.h
@@ -47,14 +47,14 @@ class ScheduleMessage
     /**
       Message status.
     */
-    enum tqStatus { PublishNew, PublishUpdate, Obsolete, RequestNew,
+    enum Status { PublishNew, PublishUpdate, Obsolete, RequestNew,
                   RequestUpdate, Unknown };
 
     /**
       Create a scheduling message with method as defined in Scheduler::Method
       and a status.
     */
-    ScheduleMessage( IncidenceBase *, int method, tqStatus status );
+    ScheduleMessage( IncidenceBase *, int method, Status status );
     ~ScheduleMessage() {};
 
     /**
@@ -68,7 +68,7 @@ class ScheduleMessage
     /**
       Return status of this message.
     */
-    tqStatus status() { return mtqStatus; }
+    Status status() { return mStatus; }
     /**
       Return error message if there is any.
     */
@@ -77,12 +77,12 @@ class ScheduleMessage
     /**
       Return a human-readable name for an iTIP message status.
     */
-    static TQString statusName( tqStatus status );
+    static TQString statusName( Status status );
 
   private:
     IncidenceBase *mIncidence;
     int mMethod;
-    tqStatus mtqStatus;
+    Status mStatus;
     TQString mError;
 
     class Private;
@@ -140,7 +140,7 @@ class LIBKCAL_EXPORT Scheduler
       on who's behalf this transaction is to be performed.
     */
     bool acceptTransaction( IncidenceBase *, Method method,
-                            ScheduleMessage::tqStatus status,
+                            ScheduleMessage::Status status,
                             const TQString& attendee = TQString() );
 
     /**
@@ -169,20 +169,20 @@ class LIBKCAL_EXPORT Scheduler
     FreeBusyCache *freeBusyCache() const;
 
   protected:
-    bool acceptPublish( IncidenceBase *, ScheduleMessage::tqStatus status,
+    bool acceptPublish( IncidenceBase *, ScheduleMessage::Status status,
                         Method method );
-    bool acceptRequest( IncidenceBase *, ScheduleMessage::tqStatus status,
+    bool acceptRequest( IncidenceBase *, ScheduleMessage::Status status,
                         const TQString & attendee );
-    bool acceptAdd( IncidenceBase *, ScheduleMessage::tqStatus status );
-    KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::tqStatus status );
-    bool acceptCancel( IncidenceBase *, ScheduleMessage::tqStatus status,
+    bool acceptAdd( IncidenceBase *, ScheduleMessage::Status status );
+    KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status );
+    bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status,
                        const TQString & attendee );
     bool acceptDeclineCounter( IncidenceBase *,
-                               ScheduleMessage::tqStatus status );
-    bool acceptReply( IncidenceBase *, ScheduleMessage::tqStatus status,
+                               ScheduleMessage::Status status );
+    bool acceptReply( IncidenceBase *, ScheduleMessage::Status status,
                       Method method );
-    bool acceptRefresh( IncidenceBase *, ScheduleMessage::tqStatus status );
-    bool acceptCounter( IncidenceBase *, ScheduleMessage::tqStatus status );
+    bool acceptRefresh( IncidenceBase *, ScheduleMessage::Status status );
+    bool acceptCounter( IncidenceBase *, ScheduleMessage::Status status );
     bool acceptFreeBusy( IncidenceBase *, Method method );
 
     Calendar *mCalendar;