1 files changed, 19 insertions, 19 deletions

diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp
index 4622716ae..54709eb49 100644
--- a/libkcal/scheduler.cpp
+++ b/libkcal/scheduler.cpp
@@ -39,14 +39,14 @@
 
 using namespace KCal;
 
-ScheduleMessage::ScheduleMessage(IncidenceBase *incidence,int method,ScheduleMessage::Status status)
+ScheduleMessage::ScheduleMessage(IncidenceBase *incidence,int method,ScheduleMessage::tqStatus status)
 {
   mIncidence = incidence;
   mMethod = method;
-  mStatus = status;
+  mtqStatus = status;
 }
 
-TQString ScheduleMessage::statusName(ScheduleMessage::Status status)
+TQString ScheduleMessage::statusName(ScheduleMessage::tqStatus status)
 {
   switch (status) {
     case PublishUpdate:
@@ -60,7 +60,7 @@ TQString ScheduleMessage::statusName(ScheduleMessage::Status status)
     case RequestUpdate:
       return i18n("Updated Request");
     default:
-      return i18n("Unknown Status: %1").arg(TQString::number(status));
+      return i18n("Unknown tqStatus: %1").arg(TQString::number(status));
   }
 }
 
@@ -99,7 +99,7 @@ FreeBusyCache *Scheduler::freeBusyCache() const
 
 bool Scheduler::acceptTransaction( IncidenceBase *incidence,
                                    Method method,
-                                   ScheduleMessage::Status status,
+                                   ScheduleMessage::tqStatus status,
                                    const TQString &attendee )
 {
   kdDebug(5800) << "Scheduler::acceptTransaction, method="
@@ -183,7 +183,7 @@ bool Scheduler::deleteTransaction(IncidenceBase *)
 }
 
 bool Scheduler::acceptPublish( IncidenceBase *newIncBase,
-                               ScheduleMessage::Status status, Method method )
+                               ScheduleMessage::tqStatus status, Method method )
 {
   if( newIncBase->type() == "FreeBusy" ) {
     return acceptFreeBusy( newIncBase, method );
@@ -225,7 +225,7 @@ bool Scheduler::acceptPublish( IncidenceBase *newIncBase,
 }
 
 bool Scheduler::acceptRequest( IncidenceBase *incidence,
-                               ScheduleMessage::Status status,
+                               ScheduleMessage::tqStatus status,
                                const TQString &attendee )
 {
   Incidence *inc = static_cast<Incidence *>(incidence);
@@ -330,13 +330,13 @@ bool Scheduler::acceptRequest( IncidenceBase *incidence,
     return false;
   }
 
-  // FIXME: This is a nasty hack, since we need to set a parent for the
+  // FIXME: This is a nasty hack, since we need to set a tqparent for the
   //        resource selection dialog. However, we don't have any UI methods
   //        in the calendar, only in the CalendarResources::DestinationPolicy
   //        So we need to type-cast it and extract it from the CalendarResources
-  TQWidget *tmpparent = 0;
+  TQWidget *tmptqparent = 0;
   if ( stdcal ) {
-    tmpparent = stdcal->dialogParentWidget();
+    tmptqparent = stdcal->dialogParentWidget();
     stdcal->setDialogParentWidget( 0 );
   }
 
@@ -389,14 +389,14 @@ TryAgain:
   return true;
 }
 
-bool Scheduler::acceptAdd(IncidenceBase *incidence,ScheduleMessage::Status /* status */)
+bool Scheduler::acceptAdd(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */)
 {
   deleteTransaction(incidence);
   return false;
 }
 
 bool Scheduler::acceptCancel( IncidenceBase *incidence,
-                              ScheduleMessage::Status status,
+                              ScheduleMessage::tqStatus status,
                               const TQString &attendee )
 {
   Incidence *inc = static_cast<Incidence *>( incidence );
@@ -492,7 +492,7 @@ bool Scheduler::acceptCancel( IncidenceBase *incidence,
   return ret;
 }
 
-bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::Status /* status */)
+bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */)
 {
   const IncidenceBase *toDelete = mCalendar->incidenceFromSchedulingID( incidence->uid() );
 
@@ -525,19 +525,19 @@ bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::Status /*
   return ret;
 }
 
-bool Scheduler::acceptDeclineCounter(IncidenceBase *incidence,ScheduleMessage::Status /* status */)
+bool Scheduler::acceptDeclineCounter(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */)
 {
   deleteTransaction(incidence);
   return false;
 }
 
-//bool Scheduler::acceptFreeBusy(Incidence *incidence,ScheduleMessage::Status status)
+//bool Scheduler::acceptFreeBusy(Incidence *incidence,ScheduleMessage::tqStatus status)
 //{
 //  deleteTransaction(incidence);
 //  return false;
 //}
 
-bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /* status */, Method method)
+bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */, Method method)
 {
   if(incidence->type()=="FreeBusy") {
     return acceptFreeBusy(incidence, method);
@@ -576,7 +576,7 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /*
         if (attIn->email().lower()==attEv->email().lower()) {
           //update attendee-info
           kdDebug(5800) << "Scheduler::acceptTransaction update attendee" << endl;
-          attEv->seStatus(attIn->status());
+          attEv->setqStatus(attIn->status());
           attEv->setDelegate(attIn->delegate());
           attEv->setDelegator(attIn->delegator());
           ret = true;
@@ -668,14 +668,14 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /*
   return ret;
 }
 
-bool Scheduler::acceptRefresh(IncidenceBase *incidence,ScheduleMessage::Status /* status */)
+bool Scheduler::acceptRefresh(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */)
 {
   // handled in korganizer's IncomingDialog
   deleteTransaction(incidence);
   return false;
 }
 
-bool Scheduler::acceptCounter(IncidenceBase *incidence,ScheduleMessage::Status /* status */)
+bool Scheduler::acceptCounter(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */)
 {
   deleteTransaction(incidence);
   return false;