Rename old tq methods that no longer need a unique name

4 files changed, 11 insertions, 11 deletions

diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index 6a8e01996..0a2d2b30b 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -190,7 +190,7 @@ class Formatter : public KMail::Interface::BodyPartFormatter
     }
 };
 
-static TQString directoryFortqStatus( Attendee::PartStat status )
+static TQString directoryForStatus( Attendee::PartStat status )
 {
   TQString dir;
   switch ( status ) {
@@ -367,7 +367,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
       TQString recv = to;
       if ( recv.isEmpty() )
         recv = incidence->organizer().fullName();
-      TQString statusString = directoryFortqStatus( status );  //it happens to return the right strings
+      TQString statusString = directoryForStatus( status );  //it happens to return the right strings
       return callback.mailICal( recv, msg, subject, statusString, type != Forward );
     }
 
@@ -426,7 +426,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
     bool cancelPastInvites( Incidence *incidence, const TQString &path ) const
     {
       TQString warnStr;
-      TQDateTime now = TQDateTime::tqcurrentDateTime();
+      TQDateTime now = TQDateTime::currentDateTime();
       TQDate today = now.date();
       Event * const event = dynamic_cast<Event *>( incidence );
       Todo * const todo = dynamic_cast<Todo *>( incidence );
@@ -567,7 +567,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
       }
 
       // First, save it for KOrganizer to handle
-      TQString dir = directoryFortqStatus( status );
+      TQString dir = directoryForStatus( status );
       if ( dir.isEmpty() )
         return true; // unknown status
       if ( status != Attendee::Delegated ) // we do that below for delegated incidences
@@ -649,7 +649,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
       if ( status == Attendee::Delegated ) {
         incidence = icalToString( iCal );
         myself = findMyself( incidence, receiver );
-        myself->setqStatus( status );
+        myself->seStatus( status );
         myself->setDelegate( delegateString );
         TQString name, email;
         KPIM::getNameAndMail( delegateString, name, email );
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index c99fd1c08..69a098b96 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -104,7 +104,7 @@ namespace {
           writer->queue( contact );
 
           TQString addToLinkText = i18n( "[Add this contact to the addressbook]" );
-          TQString op = TQString::tqfromLatin1( "addToAddressBook:%1" ).tqarg( count );
+          TQString op = TQString::fromLatin1( "addToAddressBook:%1" ).tqarg( count );
           writer->queue(
                 "<div align=\"center\"><a href=\"" +
                 bodyPart->makeLink( op ) +
diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp
index df89306f6..c11fed5c9 100644
--- a/plugins/kmail/bodypartformatter/text_xdiff.cpp
+++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp
@@ -71,19 +71,19 @@ namespace {
 
 
 
-      TQString addedLineStyle = TQString::tqfromLatin1(
+      TQString addedLineStyle = TQString::fromLatin1(
         "style=\""
         "color: green;\"");
       TQString fileAddStyle( "style=\"font-weight: bold; "
                             "color: green; \"" );
 
-      TQString removedLineStyle = TQString::tqfromLatin1(
+      TQString removedLineStyle = TQString::fromLatin1(
         "style=\""
         "color: red;\"");
       TQString fileRemoveStyle( "style=\"font-weight: bold; "
                                "color: red ;\"" );
 
-      TQString tableStyle = TQString::tqfromLatin1(
+      TQString tableStyle = TQString::fromLatin1(
         "style=\""
         "text-align: -khtml-auto; "
         "border: solid black 1px; "
diff --git a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
index 7ccbcc742..e74f4dce0 100644
--- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
+++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
@@ -48,7 +48,7 @@
             <property name="name">
                 <cstring>attendeeEdit</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>250</width>
                     <height>0</height>
@@ -65,7 +65,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>140</height>