Remove additional unneeded tq method conversions

8 files changed, 29 insertions, 29 deletions

diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index 3bb0054ed..796099025 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -293,12 +293,12 @@ TQDate Contact::anniversary() const
   return mAnniversary;
 }
 
-void Contact::setChildren( const TQString& tqchildren )
+void Contact::setChildren( const TQString& children )
 {
-  mChildren = tqchildren;
+  mChildren = children;
 }
 
-TQString Contact::tqchildren() const
+TQString Contact::children() const
 {
   return mChildren;
 }
@@ -619,7 +619,7 @@ bool Contact::loadAttribute( TQDomElement& element )
     }
     break;
   case 'c':
-    if ( tagName == "tqchildren" ) {
+    if ( tagName == "children" ) {
       setChildren( element.text() );
       return true;
     }
@@ -798,7 +798,7 @@ bool Contact::saveAttributes( TQDomElement& element ) const
       writeString( element, "x-logo", mLogoAttachmentName );
     if ( !sound().isNull() )
       writeString( element, "x-sound", mSoundAttachmentName );
-    writeString( element, "tqchildren", tqchildren() );
+    writeString( element, "children", children() );
     writeString( element, "gender", gender() );
     writeString( element, "language", language() );
     savePhoneAttributes( element );
@@ -1146,7 +1146,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
   // mailer, timezone, productId, sortString, agent, rfc2426 name()
 
   // Things KAddressBook can't handle, so they are saved as unhandled tags:
-  // initials, tqchildren, gender, language
+  // initials, children, gender, language
 }
 
 // The loading is: xml -> Contact -> addressee, this is the second part
diff --git a/kresources/kolab/kabc/contact.h b/kresources/kolab/kabc/contact.h
index 60c399335..6e0de80bc 100644
--- a/kresources/kolab/kabc/contact.h
+++ b/kresources/kolab/kabc/contact.h
@@ -154,8 +154,8 @@ public:
   TQString soundAttachmentName() const { return mSoundAttachmentName; }
   TQByteArray sound() const { return mSound; }
 
-  void setChildren( const TQString& tqchildren );
-  TQString tqchildren() const;
+  void setChildren( const TQString& children );
+  TQString children() const;
 
   void setGender( const TQString& gender );
   TQString gender() const;
diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp
index 9155ad43c..2617da4a1 100644
--- a/kresources/kolab/kcal/incidence.cpp
+++ b/kresources/kolab/kcal/incidence.cpp
@@ -1030,7 +1030,7 @@ void Incidence::loadAttachments()
 
 TQString Incidence::productID() const
 {
-  return TQString( "KOrganizer %1, Kolab resource" ).tqarg( korgVersion );
+  return TQString( "KOrganizer %1, Kolab resource" ).arg( korgVersion );
 }
 
 // Unhandled KCal::Incidence fields:
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index 8fa16eea3..edd94303c 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -423,7 +423,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre
      addedIncidence = inc;
    } else if ( result == 0 ) { // take both
      addedIncidence = inc;
-     addedIncidence->setSummary( i18n("Copy of: %1").tqarg( addedIncidence->summary() ) );
+     addedIncidence->setSummary( i18n("Copy of: %1").arg( addedIncidence->summary() ) );
      addedIncidence->setUid( CalFormat::createUniqueId() );
      localIncidence = local;
    }
@@ -604,24 +604,24 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
       text += "<font></b><br>";
       if ( !incidence->summary().isEmpty() )
-        text += i18n( "<b>Summary:</b> %1" ).tqarg( incidence->summary() ) + "<br>";
+        text += i18n( "<b>Summary:</b> %1" ).arg( incidence->summary() ) + "<br>";
       if ( !incidence->location().isEmpty() )
-        text += i18n( "<b>Location:</b> %1" ).tqarg( incidence->location() );
+        text += i18n( "<b>Location:</b> %1" ).arg( incidence->location() );
       text += "<br>";
       if ( !incidence->doesFloat() )
         text += i18n( "<b>Start:</b> %1, %2" )
-                .tqarg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() );
+                .arg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() );
       else
-        text += i18n( "<b>Start:</b> %1" ).tqarg( incidence->dtStartDateStr() );
+        text += i18n( "<b>Start:</b> %1" ).arg( incidence->dtStartDateStr() );
       text += "<br>";
       if ( incidence->type() == "Event" ) {
         Event* event = static_cast<Event*>( incidence );
         if ( event->hasEndDate() ) {
           if ( !event->doesFloat() ) {
             text += i18n( "<b>End:</b> %1, %2" )
-                    .tqarg( event->dtEndDateStr(), event->dtEndTimeStr() );
+                    .arg( event->dtEndDateStr(), event->dtEndTimeStr() );
           } else {
-            text += i18n( "<b>End:</b> %1" ).tqarg( event->dtEndDateStr() );
+            text += i18n( "<b>End:</b> %1" ).arg( event->dtEndDateStr() );
           }
         }
         text += "<br>";
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 488daf4af..ccbb03e58 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -126,7 +126,7 @@ int Task::percentCompleted() const
   return mPercentCompleted;
 }
 
-void Task::seStatus( KCal::Incidence::Status status )
+void Task::setStatus( KCal::Incidence::Status status )
 {
   mStatus = status;
 }
@@ -234,17 +234,17 @@ bool Task::loadAttribute( TQDomElement& element )
     setPercentCompleted( percent );
   } else if ( tagName == "status" ) {
     if ( element.text() == "in-progress" )
-      seStatus( KCal::Incidence::StatusInProcess );
+      setStatus( KCal::Incidence::StatusInProcess );
     else if ( element.text() == "completed" )
-      seStatus( KCal::Incidence::StatusCompleted );
+      setStatus( KCal::Incidence::StatusCompleted );
     else if ( element.text() == "waiting-on-someone-else" )
-      seStatus( KCal::Incidence::StatusNeedsAction );
+      setStatus( KCal::Incidence::StatusNeedsAction );
     else if ( element.text() == "deferred" )
       // Guessing a status here
-      seStatus( KCal::Incidence::StatusCanceled );
+      setStatus( KCal::Incidence::StatusCanceled );
     else
       // Default
-      seStatus( KCal::Incidence::StatusNone );
+      setStatus( KCal::Incidence::StatusNone );
   } else if ( tagName == "due-date" ) {
     setDueDate( element.text() );
   } else if ( tagName == "parent" ) {
@@ -374,7 +374,7 @@ void Task::setFields( const KCal::Todo* task )
 
   setPriority( task->priority() );
   setPercentCompleted( task->percentComplete() );
-  seStatus( task->status() );
+  setStatus( task->status() );
   setHasStartDate( task->hasStartDate() );
 
   if ( task->hasDueDate() ) {
@@ -447,7 +447,7 @@ void Task::saveTo( KCal::Todo* task )
 
   task->setPriority( priority() );
   task->setPercentComplete( percentCompleted() );
-  task->seStatus( status() );
+  task->setStatus( status() );
   task->setHasStartDate( hasStartDate() );
   task->setHasDueDate( hasDueDate() );
   if ( hasDueDate() )
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index 981c56ab7..38a12a70e 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -77,7 +77,7 @@ public:
   virtual void setPercentCompleted( int percent );
   virtual int percentCompleted() const;
 
-  virtual void seStatus( KCal::Incidence::Status status );
+  virtual void setStatus( KCal::Incidence::Status status );
   virtual KCal::Incidence::Status status() const;
 
   virtual void setParent( const TQString& parentUid );
diff --git a/kresources/kolab/knotes/note.cpp b/kresources/kolab/knotes/note.cpp
index ea5f6b285..e456e43be 100644
--- a/kresources/kolab/knotes/note.cpp
+++ b/kresources/kolab/knotes/note.cpp
@@ -225,5 +225,5 @@ void Note::saveTo( KCal::Journal* journal )
 
 TQString Note::productID() const
 {
-  return TQString( "KNotes %1, Kolab resource" ).tqarg( KNOTES_VERSION );
+  return TQString( "KNotes %1, Kolab resource" ).arg( KNOTES_VERSION );
 }
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index 1599acaa0..d88c2125e 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -126,8 +126,8 @@ static TQString plainTextBody()
     " Groupware format.\nFor a list of such email clients please"
     " visit\n%1" );
   const char * url = "http://www.kolab.org/kolab2-clients.html";
-  TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).tqarg( url );
-  TQString firstPartText = i18n( firstPartTextToTranslate ).tqarg( url );
+  TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).arg( url );
+  TQString firstPartText = i18n( firstPartTextToTranslate ).arg( url );
   if ( firstPartText != firstPartTextUntranslated ) {
     firstPartText.append("\n\n-----------------------------------------------------\n\n");
     firstPartText.append( firstPartTextUntranslated );
@@ -190,7 +190,7 @@ bool ResourceKolabBase::kmailUpdate( const TQString& resource,
 TQString ResourceKolabBase::configFile( const TQString& type ) const
 {
   return locateLocal( "config",
-                      TQString( "kresources/kolab/%1rc" ).tqarg( type ) );
+                      TQString( "kresources/kolab/%1rc" ).arg( type ) );
 }
 
 bool ResourceKolabBase::connectToKMail() const