From 99a2774ca6f1cab334de5d43fe36fc44ae889a4c Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 12 Jun 2011 01:36:19 +0000 Subject: TQt4 convert kdesdk This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kbugbuster/backend/bug.cpp | 48 ++++++++++++++++---------------- kbugbuster/backend/bug.h | 16 +++++------ kbugbuster/backend/bugcache.cpp | 16 +++++------ kbugbuster/backend/bugcache.h | 6 ++-- kbugbuster/backend/bugcommand.cpp | 12 ++++---- kbugbuster/backend/bugcommand.h | 28 +++++++++---------- kbugbuster/backend/bugdetails.cpp | 18 ++++++------ kbugbuster/backend/bugdetailsjob.cpp | 4 +-- kbugbuster/backend/bugdetailsjob.h | 1 + kbugbuster/backend/bugimpl.h | 4 +-- kbugbuster/backend/bugjob.h | 1 + kbugbuster/backend/buglistjob.cpp | 8 +++--- kbugbuster/backend/buglistjob.h | 5 ++-- kbugbuster/backend/bugmybugsjob.cpp | 6 ++-- kbugbuster/backend/bugmybugsjob.h | 5 ++-- kbugbuster/backend/bugserver.cpp | 24 ++++++++-------- kbugbuster/backend/bugserver.h | 8 +++--- kbugbuster/backend/bugserverconfig.cpp | 4 +-- kbugbuster/backend/bugserverconfig.h | 4 +-- kbugbuster/backend/bugsystem.h | 3 +- kbugbuster/backend/domprocessor.cpp | 16 +++++------ kbugbuster/backend/domprocessor.h | 4 +-- kbugbuster/backend/error.h | 6 ++-- kbugbuster/backend/htmlparser.cpp | 40 +++++++++++++-------------- kbugbuster/backend/htmlparser.h | 4 +-- kbugbuster/backend/kbbprefs.cpp | 6 ++-- kbugbuster/backend/kbbprefs.h | 4 +-- kbugbuster/backend/mailsender.cpp | 50 +++++++++++++++++----------------- kbugbuster/backend/mailsender.h | 7 +++-- kbugbuster/backend/package.cpp | 4 +-- kbugbuster/backend/packagelistjob.cpp | 4 +-- kbugbuster/backend/packagelistjob.h | 5 ++-- kbugbuster/backend/person.cpp | 16 +++++------ kbugbuster/backend/processor.cpp | 4 +-- kbugbuster/backend/processor.h | 4 +-- kbugbuster/backend/rdfprocessor.cpp | 8 +++--- kbugbuster/backend/rdfprocessor.h | 4 +-- kbugbuster/backend/smtp.cpp | 10 +++---- kbugbuster/backend/smtp.h | 5 ++-- 39 files changed, 215 insertions(+), 207 deletions(-) (limited to 'kbugbuster/backend') diff --git a/kbugbuster/backend/bug.cpp b/kbugbuster/backend/bug.cpp index aaa61273..edb94744 100644 --- a/kbugbuster/backend/bug.cpp +++ b/kbugbuster/backend/bug.cpp @@ -23,7 +23,7 @@ Bug::Bug( const Bug &other ) Bug Bug::fromNumber( const TQString &bugNumber ) { - return new BugImpl( TQString::null, Person(), bugNumber, 0xFFFFFFFF, Normal, Person(), + return new BugImpl( TQString(), Person(), bugNumber, 0xFFFFFFFF, Normal, Person(), Unconfirmed, Bug::BugMergeList() ); } @@ -56,16 +56,16 @@ TQString Bug::severityLabel( Bug::Severity s ) TQString Bug::severityToString( Bug::Severity s ) { switch ( s ) { - 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" ); + 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" ); default: kdWarning() << "Bug::severityToString invalid severity " << s << endl; - return TQString::fromLatin1( "" ); + return TQString::tqfromLatin1( "" ); } } @@ -95,7 +95,7 @@ TQValueList Bug::severities() return s; } -TQString Bug::statusLabel( Bug::Status s ) +TQString Bug::statusLabel( Bug::tqStatus s ) { switch ( s ) { @@ -109,21 +109,21 @@ TQString Bug::statusLabel( Bug::Status s ) } } -TQString Bug::statusToString( Bug::Status s ) +TQString Bug::statusToString( Bug::tqStatus s ) { switch ( s ) { - 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" ); + 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" ); default: kdWarning() << "Bug::statusToString invalid status " << s << endl; - return TQString::fromLatin1( "" ); + return TQString::tqfromLatin1( "" ); } } -Bug::Status Bug::stringToStatus( const TQString &s, bool *ok ) +Bug::tqStatus Bug::stringTotqStatus( const TQString &s, bool *ok ) { if ( ok ) *ok = true; @@ -134,7 +134,7 @@ Bug::Status Bug::stringToStatus( const TQString &s, bool *ok ) else if ( s == "reopened" ) return Reopened; else if ( s == "closed" ) return Closed; - kdWarning() << "Bug::stringToStatus: invalid status: " << s << endl; + kdWarning() << "Bug::stringTotqStatus: invalid status: " << s << endl; if ( ok ) *ok = false; return StatusUndefined; @@ -143,7 +143,7 @@ Bug::Status Bug::stringToStatus( const TQString &s, bool *ok ) TQString Bug::title() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->title; } @@ -171,7 +171,7 @@ void Bug::setAge( uint age ) struct Person Bug::submitter() const { if ( !m_impl ) - return Person( TQString::null, TQString::null ); + return Person( TQString(), TQString() ); return m_impl->submitter; } @@ -179,7 +179,7 @@ struct Person Bug::submitter() const TQString Bug::number() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->number; } @@ -207,7 +207,7 @@ Bug::BugMergeList Bug::mergedWith() const } -Bug::Status Bug::status() const +Bug::tqStatus Bug::status() const { if ( !m_impl ) return StatusUndefined; @@ -222,7 +222,7 @@ TQString Bug::severityAsString() const Person Bug::developerTODO() const { - return (m_impl == NULL) ? Person( TQString::null, TQString::null ) : + return (m_impl == NULL) ? Person( TQString(), TQString() ) : m_impl->developerTODO; } diff --git a/kbugbuster/backend/bug.h b/kbugbuster/backend/bug.h index 406179c8..e60b0e98 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 Status { StatusUndefined, Unconfirmed, New, Assigned, Reopened, + enum tqStatus { StatusUndefined, Unconfirmed, New, Assigned, Reopened, Closed }; Bug(); @@ -55,23 +55,23 @@ public: BugMergeList mergedWith() const; /** - * Status of a bug. Currently open or closed. + * tqStatus of a bug. Currently open or closed. * TODO: Should we add a status 'deleted' here ? */ - Status status() const; - void setStatus( Status newStatus ); + tqStatus status() const; + void settqStatus( tqStatus newtqStatus ); - static TQString statusLabel( Status s ); + static TQString statusLabel( tqStatus s ); /** Return string representation of status. This function is symmetric to - stringToStatus(). + stringTotqStatus(). */ - static TQString statusToString( Status s ); + static TQString statusToString( tqStatus s ); /** Return status code of string representation. This function is symmetric to statusToString(). */ - static Status stringToStatus( const TQString &, bool *ok = 0 ); + static tqStatus stringTotqStatus( 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 a6ef25df..1ce73241 100644 --- a/kbugbuster/backend/bugcache.cpp +++ b/kbugbuster/backend/bugcache.cpp @@ -59,7 +59,7 @@ Package::List BugCache::loadPackageList() TQStringList::ConstIterator it; for( it = packages.begin(); it != packages.end(); ++it ) { if ((*it) == "") continue; - if ((*it).contains("/")) continue; + if ((*it).tqcontains("/")) continue; m_cachePackages->setGroup(*it); @@ -75,7 +75,7 @@ Package::List BugCache::loadPackageList() return pkgs; } -void BugCache::invalidatePackageList() +void BugCache::tqinvalidatePackageList() { // Completely wipe out packages.cache TQStringList packages = m_cachePackages->groupList(); @@ -97,7 +97,7 @@ void BugCache::saveBugList( const Package &pkg, const TQString &component, const m_cacheBugs->setGroup( number ); m_cacheBugs->writeEntry( "Title", (*it).title() ); m_cacheBugs->writeEntry( "Severity", Bug::severityToString((*it).severity()) ); - m_cacheBugs->writeEntry( "Status", Bug::statusToString((*it).status()) ); + m_cacheBugs->writeEntry( "tqStatus", Bug::statusToString((*it).status()) ); m_cacheBugs->writeEntry( "MergedWith" , (*it).mergedWith() ); m_cacheBugs->writeEntry( "Age", ( *it ).age() ); writePerson( m_cacheBugs, "Submitter", (*it).submitter() ); @@ -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::Status status = Bug::stringToStatus( m_cacheBugs->readEntry("Status") ); + Bug::tqStatus status = Bug::stringTotqStatus( m_cacheBugs->readEntry("tqStatus") ); Bug::Severity severity = Bug::stringToSeverity( m_cacheBugs->readEntry("Severity") ); Person developerTODO = readPerson( m_cacheBugs, "TODO" ); Bug::BugMergeList mergedWith = m_cacheBugs->readIntListEntry( "MergedWith" ); @@ -158,9 +158,9 @@ Bug::List BugCache::loadBugList( const Package &pkg, const TQString &component, return bugList; } -void BugCache::invalidateBugList( const Package& pkg, const TQString &component ) +void BugCache::tqinvalidateBugList( const Package& pkg, const TQString &component ) { - kdDebug() << "BugCache::invalidateBugList " << pkg.name() + kdDebug() << "BugCache::tqinvalidateBugList " << pkg.name() << " (" << component << ")" << endl; // Erase bug list for this package @@ -172,7 +172,7 @@ void BugCache::invalidateBugList( const Package& pkg, const TQString &component m_cachePackages->setGroup( pkg.name() + "/" + component ); } - m_cachePackages->writeEntry("bugList",TQString::null); + m_cachePackages->writeEntry("bugList",TQString()); } void BugCache::saveBugDetails( const Bug &bug, const BugDetails &details ) @@ -249,7 +249,7 @@ BugDetails BugCache::loadBugDetails( const Bug &bug ) parts ) ); } -void BugCache::invalidateBugDetails( const Bug& bug ) +void BugCache::tqinvalidateBugDetails( const Bug& bug ) { m_cacheBugs->deleteGroup( bug.number(), true ); } diff --git a/kbugbuster/backend/bugcache.h b/kbugbuster/backend/bugcache.h index bef22493..ec317ca8 100644 --- a/kbugbuster/backend/bugcache.h +++ b/kbugbuster/backend/bugcache.h @@ -15,15 +15,15 @@ class BugCache void savePackageList( const Package::List &pkgs ); Package::List loadPackageList(); - void invalidatePackageList(); + void tqinvalidatePackageList(); void saveBugList( const Package &pkg, const TQString &component, const Bug::List & ); Bug::List loadBugList( const Package &pkg, const TQString &component, bool disconnected ); - void invalidateBugList( const Package &pkg, const TQString &component ); + void tqinvalidateBugList( const Package &pkg, const TQString &component ); void saveBugDetails( const Bug &bug, const BugDetails & ); BugDetails loadBugDetails( const Bug &bug ); - void invalidateBugDetails( const Bug &bug ); + void tqinvalidateBugDetails( const Bug &bug ); bool hasBugDetails( const Bug& bug ) const; void clear(); diff --git a/kbugbuster/backend/bugcommand.cpp b/kbugbuster/backend/bugcommand.cpp index ab61afae..5aa4d522 100644 --- a/kbugbuster/backend/bugcommand.cpp +++ b/kbugbuster/backend/bugcommand.cpp @@ -11,7 +11,7 @@ TQString BugCommand::name() TQString BugCommand::details() { - return TQString::null; + return TQString(); } BugCommand *BugCommand::load( KConfig *config, const TQString &type ) @@ -56,7 +56,7 @@ TQString BugCommandClose::controlString() const if (m_message.isEmpty()) { return "close " + m_bug.number(); } else { - return TQString::null; + return TQString(); } } @@ -65,7 +65,7 @@ TQString BugCommandClose::mailAddress() const kdDebug() << "BugCommandClose::mailAddress(): number: " << m_bug.number() << endl; if (m_message.isEmpty()) { - return TQString::null; + return TQString(); } else { return m_bug.number() + "-done@bugs.kde.org"; } @@ -74,7 +74,7 @@ TQString BugCommandClose::mailAddress() const TQString BugCommandClose::mailText() const { if (m_message.isEmpty()) { - return TQString::null; + return TQString(); } else { return m_message; } @@ -204,7 +204,7 @@ TQString BugCommandReply::mailAddress() const case Quiet: return m_bug.number() + "-quiet@bugs.kde.org"; } - return TQString::null; + return TQString(); #endif } @@ -225,7 +225,7 @@ TQString BugCommandReply::name() case Quiet: return i18n("Reply (Quiet)"); } - return TQString::null; + return TQString(); #endif } diff --git a/kbugbuster/backend/bugcommand.h b/kbugbuster/backend/bugcommand.h index 38b2513f..bb53cdb4 100644 --- a/kbugbuster/backend/bugcommand.h +++ b/kbugbuster/backend/bugcommand.h @@ -18,10 +18,10 @@ class BugCommand { BugCommand( const Bug &bug, const Package &pkg ) : m_bug( bug ), m_package( pkg ) {} virtual ~BugCommand() {} - virtual TQString controlString() const { return TQString::null; } + virtual TQString controlString() const { return TQString(); } - virtual TQString mailAddress() const { return TQString::null; } - virtual TQString mailText() const { return TQString::null; } + virtual TQString mailAddress() const { return TQString(); } + virtual TQString mailText() const { return TQString(); } Bug bug() const { return m_bug; } Package package() const { return m_package; } @@ -29,7 +29,7 @@ class BugCommand { virtual TQString name(); virtual TQString details(); - virtual TQString type() const { return TQString::null; } + virtual TQString type() const { return TQString(); } virtual void save( KConfig * ) = 0; static BugCommand *load( KConfig *, const TQString &type ); @@ -51,7 +51,7 @@ class BugCommandClose : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("Close"); } + TQString type() const { return TQString::tqfromLatin1("Close"); } void save( KConfig * ); @@ -68,7 +68,7 @@ class BugCommandCloseSilently : public BugCommand { TQString name(); - TQString type() const { return TQString::fromLatin1("CloseSilently"); } + TQString type() const { return TQString::tqfromLatin1("CloseSilently"); } void save( KConfig * ); }; @@ -82,7 +82,7 @@ class BugCommandReopen : public BugCommand { TQString name(); - TQString type() const { return TQString::fromLatin1("Reopen"); } + TQString type() const { return TQString::tqfromLatin1("Reopen"); } void save( KConfig * ); }; @@ -97,7 +97,7 @@ class BugCommandRetitle : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("Retitle"); } + TQString type() const { return TQString::tqfromLatin1("Retitle"); } void save( KConfig * ); @@ -115,7 +115,7 @@ class BugCommandMerge : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("Merge"); } + TQString type() const { return TQString::tqfromLatin1("Merge"); } void save( KConfig * ); @@ -130,7 +130,7 @@ class BugCommandUnmerge : public BugCommand { TQString name(); - TQString type() const { return TQString::fromLatin1("Unmerge"); } + TQString type() const { return TQString::tqfromLatin1("Unmerge"); } void save( KConfig * ); @@ -148,7 +148,7 @@ class BugCommandReply : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("Reply"); } + TQString type() const { return TQString::tqfromLatin1("Reply"); } void save( KConfig * ); @@ -169,7 +169,7 @@ class BugCommandReplyPrivate : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("ReplyPrivate"); } + TQString type() const { return TQString::tqfromLatin1("ReplyPrivate"); } void save( KConfig * ); @@ -186,7 +186,7 @@ class BugCommandSeverity : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("Severity"); } + TQString type() const { return TQString::tqfromLatin1("Severity"); } TQString controlString() const; @@ -204,7 +204,7 @@ class BugCommandReassign : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("Reassign"); } + TQString type() const { return TQString::tqfromLatin1("Reassign"); } TQString controlString() const; diff --git a/kbugbuster/backend/bugdetails.cpp b/kbugbuster/backend/bugdetails.cpp index d1ce4666..5dcfbcd4 100644 --- a/kbugbuster/backend/bugdetails.cpp +++ b/kbugbuster/backend/bugdetails.cpp @@ -35,7 +35,7 @@ BugDetails::~BugDetails() TQString BugDetails::version() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->version; } @@ -43,7 +43,7 @@ TQString BugDetails::version() const TQString BugDetails::source() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->source; } @@ -51,7 +51,7 @@ TQString BugDetails::source() const TQString BugDetails::compiler() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->compiler; } @@ -59,7 +59,7 @@ TQString BugDetails::compiler() const TQString BugDetails::os() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->os; } @@ -79,7 +79,7 @@ int BugDetails::age() const if ( !m_impl ) return 0; - return submissionDate().daysTo( TQDateTime::currentDateTime() ); + return submissionDate().daysTo( TQDateTime::tqcurrentDateTime() ); } BugDetailsPart::List BugDetails::parts() const @@ -181,7 +181,7 @@ TQValueList BugDetails::extractAttachments( const TQStri kdDebug() << "BugDetails::extractAttachments found header " << *rit << endl; #endif // Taken from libkdenetwork/kmime_headers.cpp - int pos=header.find("filename=", 0, false); + int pos=header.tqfind("filename=", 0, false); TQString fn; if(pos>-1) { pos+=9; @@ -226,12 +226,12 @@ TQValueList BugDetails::extractAttachments( const TQStri break; if ( line == boundary+"--" ) // end of last attachment { - boundary = TQString::null; + boundary = TQString(); break; } contents += line; // no newline, because of linebreaking between
} - contents = contents.replace( TQRegExp("
"), TQString::null ); + contents = contents.tqreplace( TQRegExp("
"), TQString() ); #ifdef DEBUG_EXTRACT kdDebug() << "BugDetails::extractAttachments contents=***\n" << contents << "\n***" << endl; #endif @@ -241,7 +241,7 @@ TQValueList 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").arg(filename).arg(encoding) ); + KMessageBox::information( 0, i18n("Attachment %1 could not be decoded.\nEncoding: %2").tqarg(filename).tqarg(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 1218023d..22ee31c7 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").arg( m_bug.number() ) - .arg( err.message() ) ); + emit error( i18n("Bug %1: %2").tqarg( m_bug.number() ) + .tqarg( err.message() ) ); } else { emit bugDetailsAvailable( m_bug, bugDetails ); } diff --git a/kbugbuster/backend/bugdetailsjob.h b/kbugbuster/backend/bugdetailsjob.h index 5b6a8887..946ea7a5 100644 --- a/kbugbuster/backend/bugdetailsjob.h +++ b/kbugbuster/backend/bugdetailsjob.h @@ -9,6 +9,7 @@ class BugDetailsJob : public BugJob { Q_OBJECT + TQ_OBJECT public: BugDetailsJob( BugServer * ); virtual ~BugDetailsJob(); diff --git a/kbugbuster/backend/bugimpl.h b/kbugbuster/backend/bugimpl.h index 7fefc53d..b1d94b2d 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::Status _status, const Bug::BugMergeList& _mergedWith ) + Bug::tqStatus _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::Status status; + Bug::tqStatus status; Bug::BugMergeList mergedWith; }; diff --git a/kbugbuster/backend/bugjob.h b/kbugbuster/backend/bugjob.h index 00ab7f8f..91103a99 100644 --- a/kbugbuster/backend/bugjob.h +++ b/kbugbuster/backend/bugjob.h @@ -8,6 +8,7 @@ class BugJob : public KIO::Job { Q_OBJECT + TQ_OBJECT public: BugJob( BugServer * ); virtual ~BugJob(); diff --git a/kbugbuster/backend/buglistjob.cpp b/kbugbuster/backend/buglistjob.cpp index 74fe5427..01910ea2 100644 --- a/kbugbuster/backend/buglistjob.cpp +++ b/kbugbuster/backend/buglistjob.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "buglistjob.h" @@ -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").arg( m_package.name() ) - .arg( err.message() ) ); + emit error( i18n("Package %1: %2").tqarg( m_package.name() ) + .tqarg( err.message() ) ); } else { emit bugListAvailable( m_package, m_component, bugs ); } diff --git a/kbugbuster/backend/buglistjob.h b/kbugbuster/backend/buglistjob.h index 4272325d..aa69c748 100644 --- a/kbugbuster/backend/buglistjob.h +++ b/kbugbuster/backend/buglistjob.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef BUGLISTJOB_H #define BUGLISTJOB_H @@ -33,6 +33,7 @@ class BugListJob : public BugJob { Q_OBJECT + TQ_OBJECT public: BugListJob( BugServer * ); virtual ~BugListJob(); diff --git a/kbugbuster/backend/bugmybugsjob.cpp b/kbugbuster/backend/bugmybugsjob.cpp index 87767a5b..869b0827 100644 --- a/kbugbuster/backend/bugmybugsjob.cpp +++ b/kbugbuster/backend/bugmybugsjob.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "bugmybugsjob.h" @@ -67,7 +67,7 @@ void BugMyBugsJob::process( const TQByteArray &data ) delete processor; if ( err ) - emit error( i18n( "My Bugs: %2" ).arg( err.message() ) ); + emit error( i18n( "My Bugs: %2" ).tqarg( err.message() ) ); else emit bugListAvailable( i18n( "My Bugs" ), bugs ); } diff --git a/kbugbuster/backend/bugmybugsjob.h b/kbugbuster/backend/bugmybugsjob.h index 92685593..7cd1851a 100644 --- a/kbugbuster/backend/bugmybugsjob.h +++ b/kbugbuster/backend/bugmybugsjob.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef BUGMYBUGSJOB_H @@ -32,6 +32,7 @@ class BugMyBugsJob : public BugJob { Q_OBJECT + TQ_OBJECT public: BugMyBugsJob( BugServer * ); diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp index 768b76cd..a5d31bbf 100644 --- a/kbugbuster/backend/bugserver.cpp +++ b/kbugbuster/backend/bugserver.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "bugserver.h" @@ -152,7 +152,7 @@ KURL BugServer::attachmentEditLink( const TQString &id ) return url; } -Bug::Status BugServer::bugStatus( const TQString &str ) +Bug::tqStatus BugServer::bugtqStatus( const TQString &str ) { if ( str == "UNCONFIRMED" ) { return Bug::Unconfirmed; @@ -216,14 +216,14 @@ bool BugServer::queueCommand( BugCommand *cmd ) TQPtrList BugServer::queryCommands( const Bug &bug ) const { - CommandsMap::ConstIterator it = mCommands.find( bug.number() ); + CommandsMap::ConstIterator it = mCommands.tqfind( bug.number() ); if (it == mCommands.end()) return TQPtrList(); else return *it; } bool BugServer::hasCommandsFor( const Bug &bug ) const { - CommandsMap::ConstIterator it = mCommands.find( bug.number() ); + CommandsMap::ConstIterator it = mCommands.tqfind( bug.number() ); return it != mCommands.end(); } @@ -270,13 +270,13 @@ void BugServer::sendCommands( MailSender *mailer, const TQString &senderName, } if (!bug.isNull()) { mCommandsFile->deleteGroup( bug.number(), true ); // done, remove command - mCache->invalidateBugDetails( bug ); + mCache->tqinvalidateBugDetails( bug ); if ( !pkg.isNull() ) { - mCache->invalidateBugList( pkg, TQString::null ); // the status of the bug comes from the buglist... + mCache->tqinvalidateBugList( pkg, TQString() ); // the status of the bug comes from the buglist... TQStringList::ConstIterator it2; for (it2 = pkg.components().begin();it2 != pkg.components().end();++it2) { - mCache->invalidateBugList( pkg, (*it2) ); // the status of the bug comes from the buglist... + mCache->tqinvalidateBugList( pkg, (*it2) ); // the status of the bug comes from the buglist... } } } @@ -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").arg(cmd->controlString()) ); + result.append( i18n("Control command: %1").tqarg(cmd->controlString()) ); else - result.append( i18n("Mail to %1").arg(cmd->mailAddress()) ); + result.append( i18n("Mail to %1").tqarg(cmd->mailAddress()) ); } } return result; @@ -387,13 +387,13 @@ const Package::List &BugServer::packages() const void BugServer::setBugs( const Package &pkg, const TQString &component, const Bug::List &bugs ) { - QPair pkg_key = QPair(pkg, component); + TQPair pkg_key = TQPair(pkg, component); mBugs[ pkg_key ] = bugs; } const Bug::List &BugServer::bugs( const Package &pkg, const TQString &component ) { - QPair pkg_key = QPair(pkg, component); + TQPair pkg_key = TQPair(pkg, component); return mBugs[ pkg_key ]; } diff --git a/kbugbuster/backend/bugserver.h b/kbugbuster/backend/bugserver.h index b2095569..b865450f 100644 --- a/kbugbuster/backend/bugserver.h +++ b/kbugbuster/backend/bugserver.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef BUGSERVER_H #define BUGSERVER_H @@ -64,7 +64,7 @@ class BugServer KURL attachmentViewLink( const TQString &id ); KURL attachmentEditLink( const TQString &id ); - Bug::Status bugStatus( const TQString & ); + Bug::tqStatus bugtqStatus( const TQString & ); Bug::Severity bugSeverity( const TQString & ); @@ -133,7 +133,7 @@ class BugServer Package::List mPackages; // Map package -> list of bugs - typedef TQMap< QPair, Bug::List > BugListMap; + typedef TQMap< TQPair, Bug::List > BugListMap; BugListMap mBugs; // Map bug -> bug details (i.e. contents of the report) typedef TQMap< Bug, BugDetails > BugDetailsMap; diff --git a/kbugbuster/backend/bugserverconfig.cpp b/kbugbuster/backend/bugserverconfig.cpp index 91be1f0c..aca9d5cd 100644 --- a/kbugbuster/backend/bugserverconfig.cpp +++ b/kbugbuster/backend/bugserverconfig.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "bugserverconfig.h" diff --git a/kbugbuster/backend/bugserverconfig.h b/kbugbuster/backend/bugserverconfig.h index 2868a791..39a34463 100644 --- a/kbugbuster/backend/bugserverconfig.h +++ b/kbugbuster/backend/bugserverconfig.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef BUGSERVERCONFIG_H #define BUGSERVERCONFIG_H diff --git a/kbugbuster/backend/bugsystem.h b/kbugbuster/backend/bugsystem.h index c5c37d18..d24b011d 100644 --- a/kbugbuster/backend/bugsystem.h +++ b/kbugbuster/backend/bugsystem.h @@ -20,9 +20,10 @@ class BugServer; class BugServerConfig; class BugJob; -class BugSystem : public QObject +class BugSystem : public TQObject { Q_OBJECT + TQ_OBJECT friend class BugJob; public: BugSystem(); diff --git a/kbugbuster/backend/domprocessor.cpp b/kbugbuster/backend/domprocessor.cpp index bfef2ca6..9b5c2944 100644 --- a/kbugbuster/backend/domprocessor.cpp +++ b/kbugbuster/backend/domprocessor.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "domprocessor.h" @@ -170,7 +170,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement, TQString submitterName; TQString submitterEmail; TQString bugNr; - Bug::Status status = Bug::StatusUndefined; + Bug::tqStatus 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()->bugStatus( e.text() ); + status = server()->bugtqStatus( 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::currentDateTime() ); + age = ( TQDateTime::fromString( e.text(), Qt::ISODate ) ).daysTo( TQDateTime::tqcurrentDateTime() ); } Person submitter( submitterName, submitterEmail ); @@ -250,7 +250,7 @@ KBB::Error DomProcessor::parseDomBugDetails( const TQDomElement &element, } else if ( e2.tagName() == "thetext" ) { TQString in; if ( encoding == "base64" ) { - in = KCodecs::base64Decode( e2.text().latin1() ); + in = KCodecs::base64Decode( TQCString(e2.text().latin1()) ); } else { in = e2.text(); } @@ -273,7 +273,7 @@ KBB::Error DomProcessor::parseDomBugDetails( const TQDomElement &element, text += raw; } TQString bugBaseURL = server()->serverConfig().baseUrl().htmlURL(); - text = "
" + wrapLines( text ).replace( TQRegExp( "(Created an attachment \\(id=([0-9]+)\\))" ),
+          text = "
" + wrapLines( text ).tqreplace( TQRegExp( "(Created an attachment \\(id=([0-9]+)\\))" ),
               "\\1" ) + "\n
";
         }
       }
@@ -361,7 +361,7 @@ TQString DomProcessor::wrapLines( const TQString &text )
       TQString wrappedLine;
       while ( line.length() > uint( wrap ) )
       {
-          int breakPoint = line.findRev( ' ', wrap );
+          int breakPoint = line.tqfindRev( ' ', wrap );
           //kdDebug() << "Breaking at " << breakPoint << endl;
           if( breakPoint == -1 ) {
               wrappedLine += line.left( wrap ) + '\n';
diff --git a/kbugbuster/backend/domprocessor.h b/kbugbuster/backend/domprocessor.h
index a561cbea..0ee5cc85 100644
--- a/kbugbuster/backend/domprocessor.h
+++ b/kbugbuster/backend/domprocessor.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef DOMPROCESSOR_H
 #define DOMPROCESSOR_H
diff --git a/kbugbuster/backend/error.h b/kbugbuster/backend/error.h
index 595c070c..f0ba75af 100644
--- a/kbugbuster/backend/error.h
+++ b/kbugbuster/backend/error.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KBB_ERROR_H
 #define KBB_ERROR_H
@@ -28,7 +28,7 @@ namespace KBB {
 class Error
 {
   public:
-    Error( const TQString &msg = TQString::null ) : mMsg( msg ) {}
+    Error( const TQString &msg = TQString() ) : mMsg( msg ) {}
 
     operator bool() { return !mMsg.isEmpty(); }
 
diff --git a/kbugbuster/backend/htmlparser.cpp b/kbugbuster/backend/htmlparser.cpp
index 055b8d11..e9840e6b 100644
--- a/kbugbuster/backend/htmlparser.cpp
+++ b/kbugbuster/backend/htmlparser.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "htmlparser.h"
@@ -100,35 +100,35 @@ void HtmlParser::processResult( Package::List & )
 
 TQString HtmlParser::getAttribute( const TQString &line, const TQString &name )
 {
-  int pos1 = line.find( name + "=\"" );
-  if ( pos1 < 1 ) return TQString::null;
+  int pos1 = line.tqfind( name + "=\"" );
+  if ( pos1 < 1 ) return TQString();
   pos1 += name.length() + 2;
-  int pos2 = line.find( "\"", pos1 );
-  if ( pos2 < 1 ) return TQString::null;
+  int pos2 = line.tqfind( "\"", pos1 );
+  if ( pos2 < 1 ) return TQString();
   return line.mid( pos1, pos2 - pos1 );
 }
 
 bool HtmlParser::getCpts( const TQString &line, TQString &key,
                           TQStringList &values )
 {
-  if ( !line.contains( TQRegExp( "\\s*cpts" ) ) ) return false;
+  if ( !line.tqcontains( TQRegExp( "\\s*cpts" ) ) ) return false;
 
 //  kdDebug() << "LINE: " << line << endl;
-  int pos1 = line.find( "[" );
+  int pos1 = line.tqfind( "[" );
   if ( pos1 < 0 ) return false;
-  int pos2 = line.find( "]", ++pos1 );
+  int pos2 = line.tqfind( "]", ++pos1 );
   if ( pos2 < 0 ) return false;
 
   key = line.mid( pos1, pos2 - pos1 );
-  int pos3 = key.find( "'" );
+  int pos3 = key.tqfind( "'" );
   if ( pos3 >= 0 ) {
-    int pos4 = key.find( "'", ++pos3 );
+    int pos4 = key.tqfind( "'", ++pos3 );
     if ( pos4 >= 0 ) key = key.mid( pos3, pos4 - pos3 );
   }
 //  kdDebug() << " KEY: " << key << endl;
 
-  pos1 = line.find( "'", ++pos2 );
-  if ( pos1 >= 0 ) pos2 = line.find( "'", ++pos1 );
+  pos1 = line.tqfind( "'", ++pos2 );
+  if ( pos1 >= 0 ) pos2 = line.tqfind( "'", ++pos1 );
 
   while ( pos1 >= 0 && pos2 >= 0 ) {
     TQString value = line.mid( pos1, pos2 - pos1 );
@@ -136,8 +136,8 @@ bool HtmlParser::getCpts( const TQString &line, TQString &key,
 
     values.append( value );
 
-    pos1 = line.find( "'", ++pos2 );
-    if ( pos1 >= 0 ) pos2 = line.find( "'", ++pos1 );
+    pos1 = line.tqfind( "'", ++pos2 );
+    if ( pos1 >= 0 ) pos2 = line.tqfind( "'", ++pos1 );
   }
 
   return true;
@@ -153,7 +153,7 @@ KBB::Error HtmlParser_2_10::parseLine( const TQString &line, Bug::List &bugs )
 //  kdDebug() << " NUMBER: " << number << endl;
 
     TQString summary;
-    int pos = line.findRev( "summary>" );
+    int pos = line.tqfindRev( "summary>" );
     if ( pos >= 0 ) summary = line.mid( pos + 8 );
 
     Bug bug( new BugImpl( summary, Person(), number, 0xFFFFFFFF, Bug::SeverityUndefined,
@@ -248,13 +248,13 @@ KBB::Error HtmlParser_2_17_1::parseLine( const TQString &line, Package::List & )
   switch ( mState ) {
     case Idle:
     case SearchComponents:
-      if ( line.contains( "var cpts" ) ) mState = Components;
+      if ( line.tqcontains( "var cpts" ) ) mState = Components;
       break;
     case SearchProducts:
-      if ( line.contains( "onchange=\"selectProduct" ) ) mState = Products;
+      if ( line.tqcontains( "onchange=\"selectProduct" ) ) mState = Products;
       break;
     case Components: {
-      if ( line.contains( TQRegExp( "\\s*function" ) ) ) {
+      if ( line.tqcontains( TQRegExp( "\\s*function" ) ) ) {
         mState = SearchProducts;
       }
       TQString key;
@@ -264,7 +264,7 @@ KBB::Error HtmlParser_2_17_1::parseLine( const TQString &line, Package::List & )
       }
     }
     case Products: {
-      if ( line.contains( "" ) ) mState = Finished;
+      if ( line.tqcontains( "" ) ) mState = Finished;
       TQString product = getAttribute( line, "value" );
       if ( !product.isEmpty() ) {
         kdDebug() << "PRODUCT: " << product << endl;
diff --git a/kbugbuster/backend/htmlparser.h b/kbugbuster/backend/htmlparser.h
index b8ad2c6f..fb4f7c2f 100644
--- a/kbugbuster/backend/htmlparser.h
+++ b/kbugbuster/backend/htmlparser.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef HTMLPARSER_H
 #define HTMLPARSER_H
diff --git a/kbugbuster/backend/kbbprefs.cpp b/kbugbuster/backend/kbbprefs.cpp
index cfef3418..7b6dbb7b 100644
--- a/kbugbuster/backend/kbbprefs.cpp
+++ b/kbugbuster/backend/kbbprefs.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include 
@@ -54,7 +54,7 @@ KBBPrefs::KBBPrefs() : KConfigSkeleton()
   addItemBool("ShowVotes", mShowVoted, false);
   addItemInt("MinimumVotes", mMinVotes, 0);
   addItemBool("SendBCC",mSendBCC,false);
-  addItemString("OverrideRecipient",mOverrideRecipient,TQString::null);
+  addItemString("OverrideRecipient",mOverrideRecipient,TQString());
   addItemInt("WrapColumn",mWrapColumn,90);
 
 
diff --git a/kbugbuster/backend/kbbprefs.h b/kbugbuster/backend/kbbprefs.h
index da70c959..87dfacd8 100644
--- a/kbugbuster/backend/kbbprefs.h
+++ b/kbugbuster/backend/kbbprefs.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KBBPREFS_H
 #define KBBPREFS_H
diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp
index 59f73db2..58ed6c93 100644
--- a/kbugbuster/backend/mailsender.cpp
+++ b/kbugbuster/backend/mailsender.cpp
@@ -1,5 +1,5 @@
-#ifndef QT_NO_ASCII_CAST
-#define QT_NO_ASCII_CAST
+#ifndef TQT_NO_ASCII_CAST
+#define TQT_NO_ASCII_CAST
 #endif
 
 #include 
@@ -39,7 +39,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
 {
   TQString from( fromName );
   if ( !fromEmail.isEmpty() )
-    from += TQString::fromLatin1( " <%2>" ).arg( fromEmail );
+    from += TQString::tqfromLatin1( " <%2>" ).tqarg( 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::fromLatin1("sendmail"),
-        TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib"));
-    if (!command.isNull()) command += TQString::fromLatin1(" -oi -t");
+    TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"),
+        TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib"));
+    if (!command.isNull()) command += TQString::tqfromLatin1(" -oi -t");
     else {
-      command = KStandardDirs::findExe(TQString::fromLatin1("mail"));
+      command = KStandardDirs::findExe(TQString::tqfromLatin1("mail"));
       if (command.isNull()) return false; // give up
 
-      command.append(TQString::fromLatin1(" -s "));
+      command.append(TQString::tqfromLatin1(" -s "));
       command.append(KProcess::quote(subject));
 
       if (bcc) {
-        command.append(TQString::fromLatin1(" -b "));
+        command.append(TQString::tqfromLatin1(" -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::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 += 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 += '\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::fromLatin1( "From: " ) + from +
-                      TQString::fromLatin1( "\nTo: " ) + to +
-                      TQString::fromLatin1( "\nSubject: " ) + subject +
-                      TQString::fromLatin1( "\nX-Mailer: KBugBuster" ) +
-                      TQString::fromLatin1( "\n\n" ) + body;
+    TQString message = TQString::tqfromLatin1( "From: " ) + from +
+                      TQString::tqfromLatin1( "\nTo: " ) + to +
+                      TQString::tqfromLatin1( "\nSubject: " ) + subject +
+                      TQString::tqfromLatin1( "\nX-Mailer: KBugBuster" ) +
+                      TQString::tqfromLatin1( "\n\n" ) + body;
 
     Smtp *smtp = new Smtp( fromEmail, recipients, message, m_smtpServer );
     connect( smtp, TQT_SIGNAL( status( const TQString & ) ),
@@ -151,29 +151,29 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
 
 void MailSender::smtpSuccess()
 {
-  if ( parent() != sender() || !parent()->inherits( "Smtp" ) )
+  if ( tqparent() != sender() || !tqparent()->inherits( "Smtp" ) )
     return;
 
-  static_cast( parent() )->quit();
+  static_cast( tqparent() )->quit();
   emit finished();
 }
 
 void MailSender::smtpError(const TQString &_command, const TQString &_response)
 {
-  if ( parent() != sender() || !parent()->inherits( "Smtp" ) )
+  if ( tqparent() != sender() || !tqparent()->inherits( "Smtp" ) )
     return;
 
   TQString command = _command;
   TQString response = _response;
 
-  Smtp *smtp = static_cast( parent() );
+  Smtp *smtp = static_cast( tqparent() );
   smtp->removeChild( this );
   delete smtp;
 
-  KMessageBox::error( qApp->activeWindow(),
+  KMessageBox::error( TQT_TQWIDGET(tqApp->activeWindow()),
                       i18n( "Error during SMTP transfer.\n"
                             "command: %1\n"
-                            "response: %2" ).arg( command ).arg( response ) );
+                            "response: %2" ).tqarg( command ).tqarg( response ) );
 
   emit finished();
   TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) );
diff --git a/kbugbuster/backend/mailsender.h b/kbugbuster/backend/mailsender.h
index 5df42c2a..b8a40d18 100644
--- a/kbugbuster/backend/mailsender.h
+++ b/kbugbuster/backend/mailsender.h
@@ -7,13 +7,14 @@
 class KURL;
 class Smtp;
 
-class MailSender : public QObject
+class MailSender : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     enum MailClient { Sendmail = 0, KMail = 1, Direct = 2 };
   
-    MailSender(MailClient,const TQString &smtpServer=TQString::null);
+    MailSender(MailClient,const TQString &smtpServer=TQString());
     virtual ~MailSender();
 
     MailSender *clone() const;
@@ -28,7 +29,7 @@ class MailSender : public QObject
     bool send(const TQString &fromName, const TQString &fromEmail,
               const TQString &to,const TQString &subject,
               const TQString &body,bool bcc=false, 
-              const TQString &recipient = TQString::null);
+              const TQString &recipient = TQString());
 
   signals:
     void status( const TQString &message );
diff --git a/kbugbuster/backend/package.cpp b/kbugbuster/backend/package.cpp
index bc9bb6fe..0eed41db 100644
--- a/kbugbuster/backend/package.cpp
+++ b/kbugbuster/backend/package.cpp
@@ -30,7 +30,7 @@ Package::~Package()
 TQString Package::name() const
 {
     if ( !m_impl )
-        return TQString::null;
+        return TQString();
     
     return m_impl->name;
 }
@@ -38,7 +38,7 @@ TQString Package::name() const
 TQString Package::description() const
 {
     if ( !m_impl )
-        return TQString::null;
+        return TQString();
     
     return m_impl->description;
 }
diff --git a/kbugbuster/backend/packagelistjob.cpp b/kbugbuster/backend/packagelistjob.cpp
index 8ebf077e..ce779c10 100644
--- a/kbugbuster/backend/packagelistjob.cpp
+++ b/kbugbuster/backend/packagelistjob.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "packagelistjob.h"
diff --git a/kbugbuster/backend/packagelistjob.h b/kbugbuster/backend/packagelistjob.h
index 6267158a..c0176911 100644
--- a/kbugbuster/backend/packagelistjob.h
+++ b/kbugbuster/backend/packagelistjob.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef __packagelistjob_h__
@@ -34,6 +34,7 @@
 class PackageListJob : public BugJob
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     PackageListJob( BugServer * );
     virtual ~PackageListJob();
diff --git a/kbugbuster/backend/person.cpp b/kbugbuster/backend/person.cpp
index 40cf72b7..368ea07c 100644
--- a/kbugbuster/backend/person.cpp
+++ b/kbugbuster/backend/person.cpp
@@ -4,7 +4,7 @@
 
 Person::Person( const TQString &fullName )
 {
-    int emailPos = fullName.find( '<' );
+    int emailPos = fullName.tqfind( '<' );
     if ( emailPos < 0 ) {
         email = fullName;
     } else {
@@ -41,10 +41,10 @@ Person Person::parseFromString( const TQString &_str )
 
     TQString str = _str;
 
-    int ltPos = str.find( '<' );
+    int ltPos = str.tqfind( '<' );
     if ( ltPos != -1 )
     {
-        int gtPos = str.find( '>', ltPos );
+        int gtPos = str.tqfind( '>', ltPos );
         if ( gtPos != -1 )
         {
             res.name = str.left( ltPos - 1 );
@@ -52,16 +52,16 @@ Person Person::parseFromString( const TQString &_str )
         }
     }
    
-    int atPos = str.find( '@' );
-    int spacedAtPos = str.find( TQString::fromLatin1( " at " ) );
+    int atPos = str.tqfind( '@' );
+    int spacedAtPos = str.tqfind( TQString::tqfromLatin1( " at " ) );
     if ( atPos == -1 && spacedAtPos != -1 )
-        str.replace( spacedAtPos, 4, TQString::fromLatin1( "@" ) );
+        str.tqreplace( spacedAtPos, 4, TQString::tqfromLatin1( "@" ) );
 
-    int spacePos = str.find( ' ' );
+    int spacePos = str.tqfind( ' ' );
     while ( spacePos != -1 )
     {
         str[ spacePos ] = '.'; 
-        spacePos = str.find( ' ', spacePos );
+        spacePos = str.tqfind( ' ', spacePos );
     }
   
     res.email = str;
diff --git a/kbugbuster/backend/processor.cpp b/kbugbuster/backend/processor.cpp
index c030761d..b6023442 100644
--- a/kbugbuster/backend/processor.cpp
+++ b/kbugbuster/backend/processor.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include 
diff --git a/kbugbuster/backend/processor.h b/kbugbuster/backend/processor.h
index 8eee8ebf..d3d8eae0 100644
--- a/kbugbuster/backend/processor.h
+++ b/kbugbuster/backend/processor.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KBB_PROCESSOR_H
 #define KBB_PROCESSOR_H
diff --git a/kbugbuster/backend/rdfprocessor.cpp b/kbugbuster/backend/rdfprocessor.cpp
index 3832e899..3beed42f 100644
--- a/kbugbuster/backend/rdfprocessor.cpp
+++ b/kbugbuster/backend/rdfprocessor.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "rdfprocessor.h"
@@ -54,7 +54,7 @@ KBB::Error RdfProcessor::parseDomBugList( const TQDomElement &element,
     TQString title;
     Person submitter;
     TQString bugNr;
-    Bug::Status status = Bug::StatusUndefined;
+    Bug::tqStatus 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()->bugStatus( e.text() );
+        status = server()->bugtqStatus( e.text() );
       } else if ( e.tagName() == "bz:severity" ) {
         severity = server()->bugSeverity( e.text() );
       } else if ( e.tagName() == "bz:summary" ) {
diff --git a/kbugbuster/backend/rdfprocessor.h b/kbugbuster/backend/rdfprocessor.h
index 18406323..fcc8c5b7 100644
--- a/kbugbuster/backend/rdfprocessor.h
+++ b/kbugbuster/backend/rdfprocessor.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef RDFPROCESSOR_H
 #define RDFPROCESSOR_H
diff --git a/kbugbuster/backend/smtp.cpp b/kbugbuster/backend/smtp.cpp
index b297af20..2496e57b 100644
--- a/kbugbuster/backend/smtp.cpp
+++ b/kbugbuster/backend/smtp.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** This file is a modified version of part of an example program for Qt.
+** This file is a modified version of part of an example program for TQt.
 ** This file may be used, distributed and modified without limitation.
 **
 ** Don Sanders 
@@ -37,7 +37,7 @@ Smtp::Smtp( const TQString &from, const TQStringList &to,
     state = smtpInit;
     command = "";
 
-    emit status( i18n( "Connecting to %1" ).arg( server ) );
+    emit status( i18n( "Connecting to %1" ).tqarg( 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" ).arg( mSocket->peerName() ) );
+    emit status( i18n( "Connected to %1" ).tqarg( mSocket->peerName() ) );
 }
 
 void Smtp::socketError(int errorCode)
@@ -149,8 +149,8 @@ void Smtp::readyRead()
     } else if ( state == smtpSuccess && responseLine[0] == '2' ) {
 	TQTimer::singleShot( 0, this, TQT_SIGNAL(success()) );
     } else if ( state == smtpQuit && responseLine[0] == '2' ) {
-	command = "QUIT";
-	*t << "QUIT\r\n";
+	command = "TQUIT";
+	*t << "TQUIT\r\n";
 	// here, we just close.
 	state = smtpClose;
 	emit status( i18n( "Message sent" ) );
diff --git a/kbugbuster/backend/smtp.h b/kbugbuster/backend/smtp.h
index f94e7660..be99d146 100644
--- a/kbugbuster/backend/smtp.h
+++ b/kbugbuster/backend/smtp.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** This file is a modified version of part of an example program for Qt.
+** This file is a modified version of part of an example program for TQt.
 ** This file may be used, distributed and modified without limitation.
 **
 ** Don Sanders 
@@ -17,9 +17,10 @@
 class TQSocket;
 class TQTextStream;
 
-class Smtp : public QObject
+class Smtp : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     Smtp( const TQString &from, const TQStringList &to, const TQString &message, 
-- 
cgit v1.2.1