rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

9 files changed, 23 insertions, 23 deletions

diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index ff19fb50d..438696412 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -668,9 +668,9 @@ void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, boo
 
 
 /*virtual*/
-bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& tqparent )
+bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& parent )
 {
-  return kmailAddSubresource( label, tqparent, s_kmailContentsType );
+  return kmailAddSubresource( label, parent, s_kmailContentsType );
 }
 
 /*virtual*/
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index 2107642b6..04db68a6e 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -920,7 +920,7 @@ KCal::Alarm::List ResourceKolab::relevantAlarms( const KCal::Alarm::List &alarms
   while ( it != alarms.end() ) {
     KCal::Alarm *a = (*it);
     ++it;
-    const TQString &uid = a->tqparent()->uid();
+    const TQString &uid = a->parent()->uid();
      if ( mUidMap.contains( uid ) ) {
        const TQString &sr = mUidMap[ uid ].resource();
        Kolab::SubResource *subResource = 0;
@@ -1231,16 +1231,16 @@ Kolab::ResourceMap* ResourceKolab::subResourceMap( const TQString& contentsType
 
 
 /*virtual*/
-bool ResourceKolab::addSubresource( const TQString& resource, const TQString& tqparent )
+bool ResourceKolab::addSubresource( const TQString& resource, const TQString& parent )
 {
    kdDebug(5650) << "KCal Kolab resource - adding subresource: " << resource << endl;
    TQString contentsType = kmailCalendarContentsType;
-   if ( !tqparent.isEmpty() ) {
-     if ( mEventSubResources.contains( tqparent ) )
+   if ( !parent.isEmpty() ) {
+     if ( mEventSubResources.contains( parent ) )
        contentsType = kmailCalendarContentsType;
-     else if ( mTodoSubResources.contains( tqparent ) )
+     else if ( mTodoSubResources.contains( parent ) )
        contentsType = kmailTodoContentsType;
-     else if ( mJournalSubResources.contains( tqparent ) )
+     else if ( mJournalSubResources.contains( parent ) )
        contentsType = kmailJournalContentsType;
    } else {
      TQStringList contentTypeChoices;
@@ -1255,7 +1255,7 @@ bool ResourceKolab::addSubresource( const TQString& resource, const TQString& tq
        contentsType = kmailJournalContentsType;
    }
 
-   return kmailAddSubresource( resource, tqparent, contentsType );
+   return kmailAddSubresource( resource, parent, contentsType );
 }
 
 /*virtual*/
diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h
index 1535403a6..872fbda4c 100644
--- a/kresources/kolab/kcal/resourcekolab.h
+++ b/kresources/kolab/kcal/resourcekolab.h
@@ -140,7 +140,7 @@ public:
 
   virtual TQString subresourceIdentifier( Incidence *incidence );
 
-  virtual bool addSubresource( const TQString& resource, const TQString& tqparent );
+  virtual bool addSubresource( const TQString& resource, const TQString& parent );
   virtual bool removeSubresource( const TQString& resource );
 
   virtual TQString subresourceType( const TQString &resource );
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 7bf5a601c..570bb47bc 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -141,7 +141,7 @@ void Task::setParent( const TQString& parentUid )
   mParent = parentUid;
 }
 
-TQString Task::tqparent() const
+TQString Task::parent() const
 {
   return mParent;
 }
@@ -247,7 +247,7 @@ bool Task::loadAttribute( TQDomElement& element )
       setqStatus( KCal::Incidence::StatusNone );
   } else if ( tagName == "due-date" ) {
     setDueDate( element.text() );
-  } else if ( tagName == "tqparent" ) {
+  } else if ( tagName == "parent" ) {
     setParent( element.text() );
   } else if ( tagName == "x-completed-date" ) {
     setCompletedDate( stringToDateTime( element.text() ) );
@@ -307,8 +307,8 @@ bool Task::saveAttributes( TQDomElement& element ) const
     }
   }
 
-  if ( !tqparent().isNull() ) {
-    writeString( element, "tqparent", tqparent() );
+  if ( !parent().isNull() ) {
+    writeString( element, "parent", parent() );
   }
 
   if ( hasCompletedDate() && percentCompleted() == 100 ) {
@@ -453,8 +453,8 @@ void Task::saveTo( KCal::Todo* task )
   if ( hasDueDate() )
     task->setDtDue( utcToLocal( dueDate() ) );
 
-  if ( !tqparent().isNull() )
-    task->setRelatedToUid( tqparent() );
+  if ( !parent().isNull() )
+    task->setRelatedToUid( parent() );
 
   if ( hasCompletedDate() && task->percentComplete() == 100 )
     task->setCompleted( utcToLocal( mCompletedDate ) );
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index 5990192b9..43780c00e 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -81,7 +81,7 @@ public:
   virtual KCal::Incidence::tqStatus status() const;
 
   virtual void setParent( const TQString& parentUid );
-  virtual TQString tqparent() const;
+  virtual TQString parent() const;
 
   virtual void setHasStartDate( bool );
   virtual bool hasStartDate() const;
diff --git a/kresources/kolab/shared/kmailconnection.cpp b/kresources/kolab/shared/kmailconnection.cpp
index 8e584fb2a..e82102a34 100644
--- a/kresources/kolab/shared/kmailconnection.cpp
+++ b/kresources/kolab/shared/kmailconnection.cpp
@@ -295,11 +295,11 @@ bool KMailConnection::kmailUpdate( const TQString& resource,
 }
 
 bool KMailConnection::kmailAddSubresource( const TQString& resource,
-                                           const TQString& tqparent,
+                                           const TQString& parent,
                                            const TQString& contentsType )
 {
   return connectToKMail()
-      && mKMailIcalIfaceStub->addSubresource( resource, tqparent, contentsType )
+      && mKMailIcalIfaceStub->addSubresource( resource, parent, contentsType )
       && mKMailIcalIfaceStub->ok();
 }
 
diff --git a/kresources/kolab/shared/kmailconnection.h b/kresources/kolab/shared/kmailconnection.h
index b7befb4de..ec49bfd11 100644
--- a/kresources/kolab/shared/kmailconnection.h
+++ b/kresources/kolab/shared/kmailconnection.h
@@ -108,7 +108,7 @@ public:
 
   bool kmailTriggerSync( const TQString& contentsType );
   bool kmailAddSubresource( const TQString& resource,
-                            const TQString& tqparent,
+                            const TQString& parent,
                             const TQString& contentsType );
   bool kmailRemoveSubresource( const TQString& resource );
 
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index 90464b6b0..a357b0d62 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -199,10 +199,10 @@ bool ResourceKolabBase::connectToKMail() const
 }
 
 bool ResourceKolabBase::kmailAddSubresource( const TQString& resource,
-                                             const TQString& tqparent,
+                                             const TQString& parent,
                                              const TQString& contentsType )
 {
-  return mConnection->kmailAddSubresource( resource, tqparent, contentsType );
+  return mConnection->kmailAddSubresource( resource, parent, contentsType );
 }
 
 bool ResourceKolabBase::kmailRemoveSubresource( const TQString& resource )
diff --git a/kresources/kolab/shared/resourcekolabbase.h b/kresources/kolab/shared/resourcekolabbase.h
index d16f2a576..f32c151fd 100644
--- a/kresources/kolab/shared/resourcekolabbase.h
+++ b/kresources/kolab/shared/resourcekolabbase.h
@@ -162,7 +162,7 @@ protected:
                     const TQStringList& attachmentNames = TQStringList(),
                     const TQStringList& deletedAttachments = TQStringList() );
 
-  bool kmailAddSubresource( const TQString& resource, const TQString& tqparent,
+  bool kmailAddSubresource( const TQString& resource, const TQString& parent,
                             const TQString& contentsType );
   bool kmailRemoveSubresource( const TQString& resource );