Rename a number of old tq methods that are no longer tq specific

18 files changed, 81 insertions, 81 deletions

diff --git a/kbugbuster/backend/bug.cpp b/kbugbuster/backend/bug.cpp
index c2328122..ec249ef7 100644
--- a/kbugbuster/backend/bug.cpp
+++ b/kbugbuster/backend/bug.cpp
@@ -56,16 +56,16 @@ TQString Bug::severityLabel( Bug::Severity s )
 TQString Bug::severityToString( Bug::Severity s )
 {
   switch ( s ) {
-    case Critical: return TQString::tqfromLatin1( "critical" );
-    case Grave: return TQString::tqfromLatin1( "grave" );
-    case Major: return TQString::tqfromLatin1( "major" );
-    case Crash: return TQString::tqfromLatin1( "crash" );
-    case Normal: return TQString::tqfromLatin1( "normal" );
-    case Minor: return TQString::tqfromLatin1( "minor" );
-    case Wishlist: return TQString::tqfromLatin1( "wishlist" );
+    case Critical: return TQString::fromLatin1( "critical" );
+    case Grave: return TQString::fromLatin1( "grave" );
+    case Major: return TQString::fromLatin1( "major" );
+    case Crash: return TQString::fromLatin1( "crash" );
+    case Normal: return TQString::fromLatin1( "normal" );
+    case Minor: return TQString::fromLatin1( "minor" );
+    case Wishlist: return TQString::fromLatin1( "wishlist" );
     default:
       kdWarning() << "Bug::severityToString invalid severity " << s << endl;
-      return TQString::tqfromLatin1( "<invalid>" );
+      return TQString::fromLatin1( "<invalid>" );
    }
 }
 
@@ -95,7 +95,7 @@ TQValueList<Bug::Severity> Bug::severities()
     return s;
 }
 
-TQString Bug::statusLabel( Bug::tqStatus s )
+TQString Bug::statusLabel( Bug::Status s )
 {
     switch ( s )
     {
@@ -109,21 +109,21 @@ TQString Bug::statusLabel( Bug::tqStatus s )
     }
 }
 
-TQString Bug::statusToString( Bug::tqStatus s )
+TQString Bug::statusToString( Bug::Status s )
 {
   switch ( s ) {
-    case Unconfirmed: return TQString::tqfromLatin1( "unconfirmed" );
-    case New: return TQString::tqfromLatin1( "new" );
-    case Assigned: return TQString::tqfromLatin1( "assigned" );
-    case Reopened: return TQString::tqfromLatin1( "reopened" );
-    case Closed: return TQString::tqfromLatin1( "closed" );
+    case Unconfirmed: return TQString::fromLatin1( "unconfirmed" );
+    case New: return TQString::fromLatin1( "new" );
+    case Assigned: return TQString::fromLatin1( "assigned" );
+    case Reopened: return TQString::fromLatin1( "reopened" );
+    case Closed: return TQString::fromLatin1( "closed" );
     default:
       kdWarning() << "Bug::statusToString invalid status " << s << endl;
-      return TQString::tqfromLatin1( "<invalid>" );
+      return TQString::fromLatin1( "<invalid>" );
    }
 }
 
-Bug::tqStatus Bug::stringTotqStatus( const TQString &s, bool *ok )
+Bug::Status Bug::stringToStatus( const TQString &s, bool *ok )
 {
    if ( ok )
       *ok = true;
@@ -207,7 +207,7 @@ Bug::BugMergeList Bug::mergedWith() const
 }
 
 
-Bug::tqStatus Bug::status() const
+Bug::Status Bug::status() const
 {
     if ( !m_impl )
         return StatusUndefined;
diff --git a/kbugbuster/backend/bug.h b/kbugbuster/backend/bug.h
index e60b0e98..406179c8 100644
--- a/kbugbuster/backend/bug.h
+++ b/kbugbuster/backend/bug.h
@@ -17,7 +17,7 @@ public:
 
     enum Severity { SeverityUndefined, Critical, Grave, Major, Crash, Normal,
                     Minor, Wishlist };
-    enum tqStatus { StatusUndefined, Unconfirmed, New, Assigned, Reopened,
+    enum Status { StatusUndefined, Unconfirmed, New, Assigned, Reopened,
                   Closed };
 
     Bug();
@@ -55,23 +55,23 @@ public:
     BugMergeList mergedWith() const;
 
     /**
-     * tqStatus of a bug. Currently open or closed.
+     * Status of a bug. Currently open or closed.
      * TODO: Should we add a status 'deleted' here ?
      */
-    tqStatus status() const;
-    void settqStatus( tqStatus newtqStatus );
+    Status status() const;
+    void setStatus( Status newStatus );
 
-    static TQString statusLabel( tqStatus s );
+    static TQString statusLabel( Status s );
     /**
       Return string representation of status. This function is symmetric to
-      stringTotqStatus().
+      stringToStatus().
     */
-    static TQString statusToString( tqStatus s );
+    static TQString statusToString( Status s );
     /**
       Return status code of string representation. This function is symmetric
       to statusToString().
     */
-    static tqStatus stringTotqStatus( const TQString &, bool *ok = 0 );
+    static Status stringToStatus( const TQString &, bool *ok = 0 );
 
     bool operator==( const Bug &rhs );
     bool operator<( const Bug &rhs ) const;
diff --git a/kbugbuster/backend/bugcache.cpp b/kbugbuster/backend/bugcache.cpp
index 66f59eb5..ce325a31 100644
--- a/kbugbuster/backend/bugcache.cpp
+++ b/kbugbuster/backend/bugcache.cpp
@@ -137,7 +137,7 @@ Bug::List BugCache::loadBugList( const Package &pkg, const TQString &component,
             if ( !title.isEmpty() ) // dunno how I ended up with an all empty bug in the cache
             {
                 Person submitter = readPerson( m_cacheBugs, "Submitter" );
-                Bug::tqStatus status = Bug::stringTotqStatus( m_cacheBugs->readEntry("Status") );
+                Bug::Status status = Bug::stringToStatus( m_cacheBugs->readEntry("Status") );
                 Bug::Severity severity = Bug::stringToSeverity( m_cacheBugs->readEntry("Severity") );
                 Person developerTODO = readPerson( m_cacheBugs, "TODO" );
                 Bug::BugMergeList mergedWith = m_cacheBugs->readIntListEntry( "MergedWith" );
diff --git a/kbugbuster/backend/bugcommand.h b/kbugbuster/backend/bugcommand.h
index bb53cdb4..9f68fb2e 100644
--- a/kbugbuster/backend/bugcommand.h
+++ b/kbugbuster/backend/bugcommand.h
@@ -51,7 +51,7 @@ class BugCommandClose : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("Close"); }
+    TQString type() const { return TQString::fromLatin1("Close"); }
 
     void save( KConfig * );
 
@@ -68,7 +68,7 @@ class BugCommandCloseSilently : public BugCommand {
 
     TQString name();
 
-    TQString type() const { return TQString::tqfromLatin1("CloseSilently"); }
+    TQString type() const { return TQString::fromLatin1("CloseSilently"); }
 
     void save( KConfig * );
 };
@@ -82,7 +82,7 @@ class BugCommandReopen : public BugCommand {
 
     TQString name();
 
-    TQString type() const { return TQString::tqfromLatin1("Reopen"); }
+    TQString type() const { return TQString::fromLatin1("Reopen"); }
 
     void save( KConfig * );
 };
@@ -97,7 +97,7 @@ class BugCommandRetitle : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("Retitle"); }
+    TQString type() const { return TQString::fromLatin1("Retitle"); }
 
     void save( KConfig * );
 
@@ -115,7 +115,7 @@ class BugCommandMerge : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("Merge"); }
+    TQString type() const { return TQString::fromLatin1("Merge"); }
 
     void save( KConfig * );
 
@@ -130,7 +130,7 @@ class BugCommandUnmerge : public BugCommand {
 
     TQString name();
 
-    TQString type() const { return TQString::tqfromLatin1("Unmerge"); }
+    TQString type() const { return TQString::fromLatin1("Unmerge"); }
 
     void save( KConfig * );
 
@@ -148,7 +148,7 @@ class BugCommandReply : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("Reply"); }
+    TQString type() const { return TQString::fromLatin1("Reply"); }
 
     void save( KConfig * );
 
@@ -169,7 +169,7 @@ class BugCommandReplyPrivate : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("ReplyPrivate"); }
+    TQString type() const { return TQString::fromLatin1("ReplyPrivate"); }
 
     void save( KConfig * );
 
@@ -186,7 +186,7 @@ class BugCommandSeverity : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("Severity"); }
+    TQString type() const { return TQString::fromLatin1("Severity"); }
 
     TQString controlString() const;
 
@@ -204,7 +204,7 @@ class BugCommandReassign : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("Reassign"); }
+    TQString type() const { return TQString::fromLatin1("Reassign"); }
 
     TQString controlString() const;
 
diff --git a/kbugbuster/backend/bugdetails.cpp b/kbugbuster/backend/bugdetails.cpp
index 6c153e2c..6b0ded58 100644
--- a/kbugbuster/backend/bugdetails.cpp
+++ b/kbugbuster/backend/bugdetails.cpp
@@ -79,7 +79,7 @@ int BugDetails::age() const
    if ( !m_impl )
        return 0;
 
-   return submissionDate().daysTo( TQDateTime::tqcurrentDateTime() );
+   return submissionDate().daysTo( TQDateTime::currentDateTime() );
 }
 
 BugDetailsPart::List BugDetails::parts() const
@@ -241,7 +241,7 @@ TQValueList<BugDetails::Attachment> BugDetails::extractAttachments( const TQStri
                     KCodecs::base64Decode( contents.local8Bit(), a.contents /*out*/ );
                 else
                     //KCodecs::uudecode( contents.local8Bit(), a.contents /*out*/ );
-                    KMessageBox::information( 0, i18n("Attachment %1 could not be decoded.\nEncoding: %2").tqarg(filename).tqarg(encoding) );
+                    KMessageBox::information( 0, i18n("Attachment %1 could not be decoded.\nEncoding: %2").arg(filename).arg(encoding) );
 #ifdef DEBUG_EXTRACT
                 kdDebug() << "Result: ***\n" << TQCString( a.contents.data(), a.contents.size()+1 ) << "\n*+*" << endl;
 #endif
diff --git a/kbugbuster/backend/bugdetailsjob.cpp b/kbugbuster/backend/bugdetailsjob.cpp
index 22ee31c7..1218023d 100644
--- a/kbugbuster/backend/bugdetailsjob.cpp
+++ b/kbugbuster/backend/bugdetailsjob.cpp
@@ -36,8 +36,8 @@ void BugDetailsJob::process( const TQByteArray &data )
     KBB::Error err = server()->processor()->parseBugDetails( data, bugDetails );
 
     if ( err ) {
-        emit error( i18n("Bug %1: %2").tqarg( m_bug.number() )
-                                      .tqarg( err.message() ) );
+        emit error( i18n("Bug %1: %2").arg( m_bug.number() )
+                                      .arg( err.message() ) );
     } else {
         emit bugDetailsAvailable( m_bug, bugDetails );
     }
diff --git a/kbugbuster/backend/bugimpl.h b/kbugbuster/backend/bugimpl.h
index b1d94b2d..7fefc53d 100644
--- a/kbugbuster/backend/bugimpl.h
+++ b/kbugbuster/backend/bugimpl.h
@@ -12,7 +12,7 @@ struct BugImpl : public KShared
 public:
     BugImpl( const TQString &_title, const Person &_submitter, TQString _number,
         uint _age, Bug::Severity _severity, Person _developerTODO,
-        Bug::tqStatus _status, const Bug::BugMergeList& _mergedWith  )
+        Bug::Status _status, const Bug::BugMergeList& _mergedWith  )
     : age( _age ), title( _title ), submitter( _submitter ), number( _number ),
         severity( _severity ), developerTODO( _developerTODO ),
         status( _status ), mergedWith( _mergedWith )
@@ -25,7 +25,7 @@ public:
     TQString number;
     Bug::Severity severity;
     Person developerTODO;
-    Bug::tqStatus status;
+    Bug::Status status;
 
     Bug::BugMergeList mergedWith;
 };
diff --git a/kbugbuster/backend/buglistjob.cpp b/kbugbuster/backend/buglistjob.cpp
index 01910ea2..419b7956 100644
--- a/kbugbuster/backend/buglistjob.cpp
+++ b/kbugbuster/backend/buglistjob.cpp
@@ -60,8 +60,8 @@ void BugListJob::process( const TQByteArray &data )
     KBB::Error err = server()->processor()->parseBugList( data, bugs );
 
     if ( err ) {
-      emit error( i18n("Package %1: %2").tqarg( m_package.name() )
-                                        .tqarg( err.message() ) );
+      emit error( i18n("Package %1: %2").arg( m_package.name() )
+                                        .arg( err.message() ) );
     } else {
       emit bugListAvailable( m_package, m_component, bugs );
     }
diff --git a/kbugbuster/backend/bugmybugsjob.cpp b/kbugbuster/backend/bugmybugsjob.cpp
index 869b0827..cd8c3005 100644
--- a/kbugbuster/backend/bugmybugsjob.cpp
+++ b/kbugbuster/backend/bugmybugsjob.cpp
@@ -67,7 +67,7 @@ void BugMyBugsJob::process( const TQByteArray &data )
     delete processor;
 
     if ( err )
-        emit error( i18n( "My Bugs: %2" ).tqarg( err.message() ) );
+        emit error( i18n( "My Bugs: %2" ).arg( err.message() ) );
     else
         emit bugListAvailable( i18n( "My Bugs" ), bugs );
 }
diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp
index a1863f58..6c8aa6fb 100644
--- a/kbugbuster/backend/bugserver.cpp
+++ b/kbugbuster/backend/bugserver.cpp
@@ -152,7 +152,7 @@ KURL BugServer::attachmentEditLink( const TQString &id )
   return url;
 }
 
-Bug::tqStatus BugServer::bugtqStatus( const TQString &str )
+Bug::Status BugServer::bugStatus( const TQString &str )
 {
   if ( str == "UNCONFIRMED" ) {
     return Bug::Unconfirmed;
@@ -318,9 +318,9 @@ TQStringList BugServer::listCommands() const
         for ( ; cmdIt.current() ; ++cmdIt ) {
             BugCommand* cmd = cmdIt.current();
             if (!cmd->controlString().isNull())
-                result.append( i18n("Control command: %1").tqarg(cmd->controlString()) );
+                result.append( i18n("Control command: %1").arg(cmd->controlString()) );
             else
-                result.append( i18n("Mail to %1").tqarg(cmd->mailAddress()) );
+                result.append( i18n("Mail to %1").arg(cmd->mailAddress()) );
         }
     }
     return result;
diff --git a/kbugbuster/backend/bugserver.h b/kbugbuster/backend/bugserver.h
index b865450f..c76b565a 100644
--- a/kbugbuster/backend/bugserver.h
+++ b/kbugbuster/backend/bugserver.h
@@ -64,7 +64,7 @@ class BugServer
     KURL attachmentViewLink( const TQString &id );
     KURL attachmentEditLink( const TQString &id );
     
-    Bug::tqStatus bugtqStatus( const TQString & );
+    Bug::Status bugStatus( const TQString & );
 
     Bug::Severity bugSeverity( const TQString & );
 
diff --git a/kbugbuster/backend/domprocessor.cpp b/kbugbuster/backend/domprocessor.cpp
index e7b1e49c..2ce57d63 100644
--- a/kbugbuster/backend/domprocessor.cpp
+++ b/kbugbuster/backend/domprocessor.cpp
@@ -24,7 +24,7 @@
 #include "domprocessor.h"
 
 #include <tqregexp.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 #include <kdebug.h>
 #include <kmdcodec.h>
@@ -170,7 +170,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement,
     TQString submitterName;
     TQString submitterEmail;
     TQString bugNr;
-    Bug::tqStatus status = Bug::StatusUndefined;
+    Bug::Status status = Bug::StatusUndefined;
     Bug::Severity severity = Bug::SeverityUndefined;
     Person developerTodo;
     Bug::BugMergeList mergedList;
@@ -184,7 +184,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement,
       if ( e.tagName() == "bugid" )
         bugNr = e.text();
       else if ( e.tagName() == "status" )
-        status = server()->bugtqStatus( e.text() );
+        status = server()->bugStatus( e.text() );
       else if ( e.tagName() == "descr" )
         title = e.text();
       else if ( e.tagName() == "reporter" )
@@ -194,7 +194,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement,
       else if ( e.tagName() == "severity" )
         severity = Bug::stringToSeverity( e.text() );
       else if ( e.tagName() == "creationdate" )
-        age = ( TQDateTime::fromString( e.text(), Qt::ISODate ) ).daysTo( TQDateTime::tqcurrentDateTime() );
+        age = ( TQDateTime::fromString( e.text(), Qt::ISODate ) ).daysTo( TQDateTime::currentDateTime() );
     }
 
     Person submitter( submitterName, submitterEmail );
diff --git a/kbugbuster/backend/htmlparser.cpp b/kbugbuster/backend/htmlparser.cpp
index 4daa3d1d..15a61084 100644
--- a/kbugbuster/backend/htmlparser.cpp
+++ b/kbugbuster/backend/htmlparser.cpp
@@ -30,7 +30,7 @@
 
 #include <tqbuffer.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 KBB::Error HtmlParser::parseBugList( const TQByteArray &data, Bug::List &bugs )
 {
diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp
index 2a5ae930..93b74eff 100644
--- a/kbugbuster/backend/mailsender.cpp
+++ b/kbugbuster/backend/mailsender.cpp
@@ -39,7 +39,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
 {
   TQString from( fromName );
   if ( !fromEmail.isEmpty() )
-    from += TQString::tqfromLatin1( " <%2>" ).tqarg( fromEmail );
+    from += TQString::fromLatin1( " <%2>" ).arg( fromEmail );
   kdDebug() << "MailSender::sendMail():\nFrom: " << from << "\nTo: " << to
             << "\nbccflag:" << bcc
             << "\nRecipient:" << recipient
@@ -53,18 +53,18 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
 
     bool needHeaders = true;
 
-    TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"),
-        TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib"));
-    if (!command.isNull()) command += TQString::tqfromLatin1(" -oi -t");
+    TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"),
+        TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib"));
+    if (!command.isNull()) command += TQString::fromLatin1(" -oi -t");
     else {
-      command = KStandardDirs::findExe(TQString::tqfromLatin1("mail"));
+      command = KStandardDirs::findExe(TQString::fromLatin1("mail"));
       if (command.isNull()) return false; // give up
 
-      command.append(TQString::tqfromLatin1(" -s "));
+      command.append(TQString::fromLatin1(" -s "));
       command.append(KProcess::quote(subject));
 
       if (bcc) {
-        command.append(TQString::tqfromLatin1(" -b "));
+        command.append(TQString::fromLatin1(" -b "));
         command.append(KProcess::quote(from));
       }
 
@@ -85,11 +85,11 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
     TQString textComplete;
     if (needHeaders)
     {
-      textComplete += TQString::tqfromLatin1("From: ") + from + '\n';
-      textComplete += TQString::tqfromLatin1("To: ") + to + '\n';
-      if (bcc) textComplete += TQString::tqfromLatin1("Bcc: ") + from + '\n';
-      textComplete += TQString::tqfromLatin1("Subject: ") + subject + '\n';
-      textComplete += TQString::tqfromLatin1("X-Mailer: KBugBuster") + '\n';
+      textComplete += TQString::fromLatin1("From: ") + from + '\n';
+      textComplete += TQString::fromLatin1("To: ") + to + '\n';
+      if (bcc) textComplete += TQString::fromLatin1("Bcc: ") + from + '\n';
+      textComplete += TQString::fromLatin1("Subject: ") + subject + '\n';
+      textComplete += TQString::fromLatin1("X-Mailer: KBugBuster") + '\n';
     }
     textComplete += '\n'; // end of headers
     textComplete += body;
@@ -121,11 +121,11 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
     else
         recipients << to;
 
-    TQString message = TQString::tqfromLatin1( "From: " ) + from +
-                      TQString::tqfromLatin1( "\nTo: " ) + to +
-                      TQString::tqfromLatin1( "\nSubject: " ) + subject +
-                      TQString::tqfromLatin1( "\nX-Mailer: KBugBuster" ) +
-                      TQString::tqfromLatin1( "\n\n" ) + body;
+    TQString message = TQString::fromLatin1( "From: " ) + from +
+                      TQString::fromLatin1( "\nTo: " ) + to +
+                      TQString::fromLatin1( "\nSubject: " ) + subject +
+                      TQString::fromLatin1( "\nX-Mailer: KBugBuster" ) +
+                      TQString::fromLatin1( "\n\n" ) + body;
 
     Smtp *smtp = new Smtp( fromEmail, recipients, message, m_smtpServer );
     connect( smtp, TQT_SIGNAL( status( const TQString & ) ),
@@ -173,7 +173,7 @@ void MailSender::smtpError(const TQString &_command, const TQString &_response)
   KMessageBox::error( TQT_TQWIDGET(tqApp->activeWindow()),
                       i18n( "Error during SMTP transfer.\n"
                             "command: %1\n"
-                            "response: %2" ).tqarg( command ).tqarg( response ) );
+                            "response: %2" ).arg( command ).arg( response ) );
 
   emit finished();
   TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) );
diff --git a/kbugbuster/backend/person.cpp b/kbugbuster/backend/person.cpp
index 8f73c512..40cf72b7 100644
--- a/kbugbuster/backend/person.cpp
+++ b/kbugbuster/backend/person.cpp
@@ -53,9 +53,9 @@ Person Person::parseFromString( const TQString &_str )
     }
    
     int atPos = str.find( '@' );
-    int spacedAtPos = str.find( TQString::tqfromLatin1( " at " ) );
+    int spacedAtPos = str.find( TQString::fromLatin1( " at " ) );
     if ( atPos == -1 && spacedAtPos != -1 )
-        str.replace( spacedAtPos, 4, TQString::tqfromLatin1( "@" ) );
+        str.replace( spacedAtPos, 4, TQString::fromLatin1( "@" ) );
 
     int spacePos = str.find( ' ' );
     while ( spacePos != -1 )
diff --git a/kbugbuster/backend/processor.cpp b/kbugbuster/backend/processor.cpp
index b6023442..c227b8cd 100644
--- a/kbugbuster/backend/processor.cpp
+++ b/kbugbuster/backend/processor.cpp
@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 #include <kdebug.h>
 #include <kmdcodec.h>
diff --git a/kbugbuster/backend/rdfprocessor.cpp b/kbugbuster/backend/rdfprocessor.cpp
index 3beed42f..578b330d 100644
--- a/kbugbuster/backend/rdfprocessor.cpp
+++ b/kbugbuster/backend/rdfprocessor.cpp
@@ -54,7 +54,7 @@ KBB::Error RdfProcessor::parseDomBugList( const TQDomElement &element,
     TQString title;
     Person submitter;
     TQString bugNr;
-    Bug::tqStatus status = Bug::StatusUndefined;
+    Bug::Status status = Bug::StatusUndefined;
     Bug::Severity severity = Bug::SeverityUndefined;
     Person developerTodo;
     Bug::BugMergeList mergedList;
@@ -68,7 +68,7 @@ KBB::Error RdfProcessor::parseDomBugList( const TQDomElement &element,
       if ( e.tagName() == "bz:id" ) {
         bugNr = e.text();
       } else if ( e.tagName() == "bz:status" ) {
-        status = server()->bugtqStatus( e.text() );
+        status = server()->bugStatus( e.text() );
       } else if ( e.tagName() == "bz:severity" ) {
         severity = server()->bugSeverity( e.text() );
       } else if ( e.tagName() == "bz:summary" ) {
diff --git a/kbugbuster/backend/smtp.cpp b/kbugbuster/backend/smtp.cpp
index df31131b..da63f926 100644
--- a/kbugbuster/backend/smtp.cpp
+++ b/kbugbuster/backend/smtp.cpp
@@ -9,7 +9,7 @@
 
 #include "smtp.h"
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqsocket.h>
 #include <tqtimer.h>
 #include <kapplication.h>
@@ -37,7 +37,7 @@ Smtp::Smtp( const TQString &from, const TQStringList &to,
     state = smtpInit;
     command = "";
 
-    emit status( i18n( "Connecting to %1" ).tqarg( server ) );
+    emit status( i18n( "Connecting to %1" ).arg( server ) );
 
     mSocket->connectToHost( server, port );
     t = new TQTextStream( mSocket );
@@ -79,7 +79,7 @@ void Smtp::quit()
 
 void Smtp::connected()
 {
-    emit status( i18n( "Connected to %1" ).tqarg( mSocket->peerName() ) );
+    emit status( i18n( "Connected to %1" ).arg( mSocket->peerName() ) );
 }
 
 void Smtp::socketError(int errorCode)