diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
commit | 99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch) | |
tree | eff34cf0762227f6baf2a93e8fef48d4bed2651c /kbugbuster | |
parent | 1c104292188541106338d4940b0f04beeb4301a0 (diff) | |
download | tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.tar.gz tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.zip |
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
Diffstat (limited to 'kbugbuster')
79 files changed, 499 insertions, 473 deletions
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( "<invalid>" ); + return TQString::tqfromLatin1( "<invalid>" ); } } @@ -95,7 +95,7 @@ TQValueList<Bug::Severity> 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( "<invalid>" ); + return TQString::tqfromLatin1( "<invalid>" ); } } -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) == "<default>") 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::Attachment> 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::Attachment> 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 <br and /> } - contents = contents.replace( TQRegExp("<br */>"), TQString::null ); + contents = contents.tqreplace( TQRegExp("<br */>"), TQString() ); #ifdef DEBUG_EXTRACT kdDebug() << "BugDetails::extractAttachments contents=***\n" << contents << "\n***" << endl; #endif @@ -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").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<BugCommand> 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<BugCommand>(); 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<Package, TQString> pkg_key = QPair<Package, TQString>(pkg, component); + TQPair<Package, TQString> pkg_key = TQPair<Package, TQString>(pkg, component); mBugs[ pkg_key ] = bugs; } const Bug::List &BugServer::bugs( const Package &pkg, const TQString &component ) { - QPair<Package, TQString> pkg_key = QPair<Package, TQString>(pkg, component); + TQPair<Package, TQString> pkg_key = TQPair<Package, TQString>(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<Package, TQString>, Bug::List > BugListMap; + typedef TQMap< TQPair<Package, TQString>, 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 = "<pre>" + wrapLines( text ).replace( TQRegExp( "(Created an attachment \\(id=([0-9]+)\\))" ), + text = "<pre>" + wrapLines( text ).tqreplace( TQRegExp( "(Created an attachment \\(id=([0-9]+)\\))" ), "<a href=\"" + bugBaseURL + "/attachment.cgi?id=\\2&action=view\">\\1</a>" ) + "\n</pre>"; } } @@ -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( "</select>" ) ) mState = Finished; + if ( line.tqcontains( "</select>" ) ) 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 <tqstring.h> @@ -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 <unistd.h> @@ -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<Smtp *>( parent() )->quit(); + static_cast<Smtp *>( 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<Smtp *>( parent() ); + Smtp *smtp = static_cast<Smtp *>( 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 <tqstylesheet.h> 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 <sanders@kde.org> @@ -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 <sanders@kde.org> @@ -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, diff --git a/kbugbuster/gui/buglvi.cpp b/kbugbuster/gui/buglvi.cpp index 18d7c064..320462ff 100644 --- a/kbugbuster/gui/buglvi.cpp +++ b/kbugbuster/gui/buglvi.cpp @@ -27,8 +27,8 @@ using namespace KBugBusterMainWindow; -BugLVI::BugLVI( KListView *parent , const Bug &bug ) -: KListViewItem( parent, bug.number() + " ", +BugLVI::BugLVI( KListView *tqparent , const Bug &bug ) +: KListViewItem( tqparent, bug.number() + " ", i18n( "1 day", "%n days", bug.age() ), bug.title(), //KStringHandler::csqueeze( bug.title(), 70 ), Bug::statusLabel( bug.status() ), @@ -45,7 +45,7 @@ BugLVI::BugLVI( KListView *parent , const Bug &bug ) Person developer = bug.developerTODO(); if ( !developer.name.isEmpty() ) - setText( 3, i18n( "%1 (%2)" ).arg( Bug::statusLabel( bug.status() ), developer.name ) ); + setText( 3, i18n( "%1 (%2)" ).tqarg( Bug::statusLabel( bug.status() ), developer.name ) ); } BugLVI::~BugLVI() diff --git a/kbugbuster/gui/buglvi.h b/kbugbuster/gui/buglvi.h index 5f66f398..94b91299 100644 --- a/kbugbuster/gui/buglvi.h +++ b/kbugbuster/gui/buglvi.h @@ -31,7 +31,7 @@ namespace KBugBusterMainWindow class BugLVI : public KListViewItem { public: - BugLVI( KListView *parent , const Bug &bug ); + BugLVI( KListView *tqparent , const Bug &bug ); ~BugLVI(); Bug& bug() { return m_bug; } diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp index f90564f1..6ceebe0f 100644 --- a/kbugbuster/gui/centralwidget.cpp +++ b/kbugbuster/gui/centralwidget.cpp @@ -48,18 +48,18 @@ using namespace KBugBusterMainWindow; CentralWidget::CentralWidget( const TQCString &initialPackage, const TQCString &initialComponent, - const TQCString &initialBug, TQWidget *parent, + const TQCString &initialBug, TQWidget *tqparent, const char * name ) - : TQWidget( parent, name ) + : TQWidget( tqparent, name ) { - // Master layout + // Master tqlayout ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); - // Create TQSplitter children - m_vertSplitter = new TQSplitter( TQSplitter::Vertical, this ); + // Create TQSplitter tqchildren + m_vertSplitter = new TQSplitter( Qt::Vertical, this ); m_listPane = new CWBugListContainer( m_vertSplitter ); - m_horSplitter = new TQSplitter( TQSplitter::Horizontal,m_vertSplitter ); + m_horSplitter = new TQSplitter( Qt::Horizontal,m_vertSplitter ); // The search pane isn't used. Should we remove the code? m_searchPane = new CWSearchWidget( m_horSplitter ); m_bugPane = new CWBugDetailsContainer( m_horSplitter ); @@ -67,7 +67,7 @@ CentralWidget::CentralWidget( const TQCString &initialPackage, m_searchPane->hide(); // m_listPane->hide(); - m_searchPane->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + m_searchPane->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); m_horSplitter->setResizeMode( m_searchPane, TQSplitter::FollowSizeHint ); @@ -188,7 +188,7 @@ void CentralWidget::writeConfig() void CentralWidget::slotRetrieveBugList( const TQString &package ) { - slotRetrieveBugList( package, TQString::null ); + slotRetrieveBugList( package, TQString() ); } void CentralWidget::slotRetrieveBugList( const TQString &p, const TQString &component ) @@ -296,14 +296,14 @@ void CentralWidget::updateBugDetails( const Bug &bug, const BugDetails &bd ) void CentralWidget::slotReloadPackageList() { - BugSystem::self()->cache()->invalidatePackageList(); + BugSystem::self()->cache()->tqinvalidatePackageList(); BugSystem::self()->retrievePackageList(); } void CentralWidget::slotReloadPackage() { if (!m_currentPackage.isNull()) { - BugSystem::self()->cache()->invalidateBugList( m_currentPackage, m_currentComponent ); + BugSystem::self()->cache()->tqinvalidateBugList( m_currentPackage, m_currentComponent ); BugSystem::self()->retrieveBugList( m_currentPackage, m_currentComponent ); } } @@ -316,7 +316,7 @@ void CentralWidget::slotLoadMyBugs() void CentralWidget::slotReloadBug() { if (!m_currentBug.isNull()) { - BugSystem::self()->cache()->invalidateBugDetails( m_currentBug ); + BugSystem::self()->cache()->tqinvalidateBugDetails( m_currentBug ); BugSystem::self()->retrieveBugDetails( m_currentBug ); } } @@ -340,11 +340,11 @@ void CentralWidget::slotExtractAttachments() for ( TQValueList<BugDetails::Attachment>::Iterator it = attachments.begin() ; it != attachments.end() ; ++it ) { // Handle duplicates - if ( fileList.contains( (*it).filename ) ) + if ( fileList.tqcontains( (*it).filename ) ) { int n = 2; // looks stupid to have "blah" and "1-blah", start at 2 TQString fn = TQString::number(n) + '-' + (*it).filename; - while ( fileList.contains( fn ) ) + while ( fileList.tqcontains( fn ) ) { ++n; fn = TQString::number(n) + '-' + (*it).filename; @@ -356,10 +356,10 @@ void CentralWidget::slotExtractAttachments() int res = KMessageBox::questionYesNoList( this, i18n("Found the following attachments. Save?"), - fileList, TQString::null, KStdGuiItem::save(), KStdGuiItem::dontSave() ); + fileList, TQString(), KStdGuiItem::save(), KStdGuiItem::dontSave() ); if ( res == KMessageBox::No ) return; - TQString dir = KFileDialog::getExistingDirectory( TQString::null, this, i18n("Select Folder Where to Save Attachments") ); + TQString dir = KFileDialog::getExistingDirectory( TQString(), this, i18n("Select Folder Where to Save Attachments") ); if ( !dir.isEmpty() ) { if ( !dir.endsWith( "/" ) ) diff --git a/kbugbuster/gui/centralwidget.h b/kbugbuster/gui/centralwidget.h index a11d6d5f..9a4f3574 100644 --- a/kbugbuster/gui/centralwidget.h +++ b/kbugbuster/gui/centralwidget.h @@ -37,19 +37,20 @@ class CWBugDetails; /** * @author Martijn Klingens */ -class CentralWidget : public QWidget +class CentralWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: CentralWidget( const TQCString &initialPackage, const TQCString &initalComponent,const TQCString& initialBug, - TQWidget* parent = 0, const char* name = 0 ); + TQWidget* tqparent = 0, const char* name = 0 ); ~CentralWidget(); - void initialize( const TQString &initialPackage = TQString::null, - const TQString &initalComponent = TQString::null, - const TQString &initialBug = TQString::null ); + void initialize( const TQString &initialPackage = TQString(), + const TQString &initalComponent = TQString(), + const TQString &initialBug = TQString() ); void readConfig(); void writeConfig(); diff --git a/kbugbuster/gui/centralwidget_base.ui b/kbugbuster/gui/centralwidget_base.ui index d2f707de..c7e36fe2 100644 --- a/kbugbuster/gui/centralwidget_base.ui +++ b/kbugbuster/gui/centralwidget_base.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>CentralWidget_Base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CentralWidget_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_searchGroup</cstring> </property> @@ -39,7 +39,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_searchContainer</cstring> </property> @@ -61,7 +61,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>m_searchStack</cstring> </property> @@ -74,7 +74,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel9</cstring> </property> @@ -85,7 +85,7 @@ <cstring>m_searchBugNumber</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout17</cstring> </property> @@ -99,7 +99,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_searchBugNumber</cstring> </property> @@ -112,7 +112,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_searchBugNumberBtn</cstring> </property> @@ -133,7 +133,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -144,7 +144,7 @@ <cstring>m_searchDesc</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout15</cstring> </property> @@ -158,7 +158,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_searchDesc</cstring> </property> @@ -171,7 +171,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_searchDescBtn</cstring> </property> @@ -196,7 +196,7 @@ </widget> </vbox> </widget> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>m_splitter</cstring> </property> @@ -209,7 +209,7 @@ <customwidgets> <customwidget> <class>QWidgetStack</class> - <header location="global">qwidgetstack.h</header> + <header location="global">tqwidgetstack.h</header> <sizehint> <width>-1</width> <height>-1</height> @@ -232,5 +232,5 @@ <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbugbuster/gui/cwbugdetails.cpp b/kbugbuster/gui/cwbugdetails.cpp index eca64758..6c6115c1 100644 --- a/kbugbuster/gui/cwbugdetails.cpp +++ b/kbugbuster/gui/cwbugdetails.cpp @@ -35,8 +35,8 @@ using namespace KBugBusterMainWindow; -CWBugDetails::CWBugDetails( TQWidget *parent , const char * name ) - : TQWidget( parent, name ) +CWBugDetails::CWBugDetails( TQWidget *tqparent , const char * name ) + : TQWidget( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -53,7 +53,7 @@ CWBugDetails::~CWBugDetails() void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) { - TQColorGroup cg = m_bugDesc->view()->palette().active(); + TQColorGroup cg = m_bugDesc->view()->tqpalette().active(); TQString text = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n" "<html><head><title></title></head>\n" @@ -65,25 +65,25 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) "td.helpBod { border-bottom: 1px solid #9CF; border-top: 0px; border-left: 1px solid #9CF; border-right: 0px; text-align: center; text-indent: 10px; font-family: Verdana, sans-serif, Arial; font-weight: normal; font-size: 11px; color: #404040; background-color: #000000; }\n" "table.sofT { text-align: center; font-family: Verdana; font-weight: normal; font-size: 11px; color: #404040; width: 100%; background-color: #fafafa; border: 1px #000000 solid; border-collapse: collapse; border-spacing: 0px; }\n" "</style>\n" ) - .arg( cg.highlight().name() ) - .arg( cg.highlightedText().name() ) ); + .tqarg( cg.highlight().name() ) + .tqarg( cg.highlightedText().name() ) ); text.append( "<body style=\"margin: 0px\">\n" ); TQString highlightStyle = TQString( "background: %1; color: %2; " ) - .arg( cg.highlight().name() ) - .arg( cg.highlightedText().name() ); + .tqarg( cg.highlight().name() ) + .tqarg( cg.highlightedText().name() ); TQString borderBottomStyle = TQString( "border-bottom: solid %1 1px; " ) - .arg( cg.foreground().name() ); + .tqarg( cg.foreground().name() ); TQString borderTopStyle = TQString( "border-top: solid %1 1px; " ) - .arg( cg.foreground().name() ); + .tqarg( cg.foreground().name() ); TQString submitter = bug.submitter().fullName( true ); int age = details.age(); text.append( "<div style=\"" + highlightStyle + "padding: 8px; float: left\">" ); text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + "\">" + i18n("Bug Report</a> from <b>%1</b> " ) - .arg( submitter ) ); + .tqarg( submitter ) ); int replies = details.parts().count() - 1; if ( replies >= 1 ) text += i18n( "(1 reply)", "(%n replies)", replies ); text += "</div>"; @@ -97,8 +97,8 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) "border-bottom: solid %3 1px; " "padding: 4px\">" "<table cellspacing=\"0\" cellpadding=\"4\" width=\"100%\">" ) - .arg( cg.background().name() ) - .arg( cg.foreground().name() ) ); + .tqarg( cg.background().name() ) + .tqarg( cg.foreground().name() ) ); text.append( textBugDetailsAttribute( details.version(), i18n("Version") ) ); text.append( textBugDetailsAttribute( details.source(), i18n("Source") ) ); text.append( textBugDetailsAttribute( details.compiler(), i18n("Compiler") ) ); @@ -121,11 +121,11 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) if ( ++it2 == bdp.end() ) text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + "\">" + i18n("Bug Report</a> from <b>%1</b>") - .arg( sender ) ); + .tqarg( sender ) ); else { - text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + TQString("#c%1").arg( replies ) + text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + TQString("#c%1").tqarg( replies ) + "\">" + i18n("Reply #%1</a> from <b>%2</b>") - .arg( replies ).arg( sender ) ); + .tqarg( replies ).tqarg( sender ) ); replies--; } text.append( "</div>\n" ); @@ -148,16 +148,16 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) if ( atts.count() > 0 ) { text.append( "<table summary=\"Attachment data table\" class=\"sofT\" cellspacing=\"0\">" ); text.append( TQString( "<tr> <td colspan=\"4\" class=\"helpHed\">%1</td> </tr>") - .arg( i18n( "Attachment List") ) ); + .tqarg( i18n( "Attachment List") ) ); text.append( TQString("<tr> <td class=\"helpHed\">%1</td> <td class=\"helpHed\">%2</td> <td class=\"helpHed\">%3</td> <td class=\"helpHed\">%4</td> </tr>") - .arg( i18n("Description") ) - .arg( i18n("Date") ) - .arg( i18n("View") ) - .arg( i18n("Edit") ) ); + .tqarg( i18n("Description") ) + .tqarg( i18n("Date") ) + .tqarg( i18n("View") ) + .tqarg( i18n("Edit") ) ); TQValueList<BugDetailsImpl::AttachmentDetails>::iterator it; for ( it = atts.begin() ; it != atts.end() ; ++it ) { - text.append( TQString("<tr><td>%1</td>").arg( (*it).description ) ) ; - text.append( TQString("<td>%1</td>").arg( (*it).date ) ); + text.append( TQString("<tr><td>%1</td>").tqarg( (*it).description ) ) ; + text.append( TQString("<td>%1</td>").tqarg( (*it).date ) ); text.append( "<td><a href=\"" + BugSystem::self()->server()->attachmentViewLink( (*it).id ).url() + "\">" + i18n("View") + "</a></td>" ); diff --git a/kbugbuster/gui/cwbugdetails.h b/kbugbuster/gui/cwbugdetails.h index e80d340f..169899c3 100644 --- a/kbugbuster/gui/cwbugdetails.h +++ b/kbugbuster/gui/cwbugdetails.h @@ -32,12 +32,13 @@ namespace KBugBusterMainWindow /** * @author Martijn Klingens */ -class CWBugDetails : public QWidget +class CWBugDetails : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CWBugDetails( TQWidget* parent = 0, const char* name = 0 ); + CWBugDetails( TQWidget* tqparent = 0, const char* name = 0 ); ~CWBugDetails(); void setBug( const Bug &, const BugDetails & ); diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp index 7b57ec1b..89611ca0 100644 --- a/kbugbuster/gui/cwbugdetailscontainer.cpp +++ b/kbugbuster/gui/cwbugdetailscontainer.cpp @@ -36,8 +36,8 @@ using namespace KBugBusterMainWindow; -CWBugDetailsContainer::CWBugDetailsContainer( TQWidget *parent , const char * name ) -: CWBugDetailsContainer_Base( parent, name ) +CWBugDetailsContainer::CWBugDetailsContainer( TQWidget *tqparent , const char * name ) +: CWBugDetailsContainer_Base( tqparent, name ) { // Do some stuff Designer can't do: m_bugCloseBtn->setIconSet( BarIconSet( "edittrash" ) ); @@ -121,17 +121,17 @@ void CWBugDetailsContainer::setBug( const Bug &bug, const BugDetails &details ) list.truncate( list.length()-2 ); //Strip off the last ", " labelText = i18n("bug #number [Merged with: a list of bugs] (severity): title","Bug #%1 [Merged with: %2] (%3): %4") - .arg( bug.number() ) - .arg( list ) - .arg( bug.severityAsString() ) - .arg( bug.title() ); + .tqarg( bug.number() ) + .tqarg( list ) + .tqarg( bug.severityAsString() ) + .tqarg( bug.title() ); } else { labelText = i18n("bug #number (severity): title","Bug #%1 (%2): %3") - .arg( bug.number() ).arg( bug.severityAsString() ) - .arg( bug.title() ); + .tqarg( bug.number() ).tqarg( bug.severityAsString() ) + .tqarg( bug.title() ); } m_bugLabel->setText( KStringHandler::tagURLs( labelText ) ); @@ -158,7 +158,7 @@ void CWBugDetailsContainer::showCommands( const Bug& bug ) if (!first) cmdText += " | "; // separator in case of multiple commands first = false; - cmdText += TQString("<b>%1</b>").arg( cmd->name() ); + cmdText += TQString("<b>%1</b>").tqarg( cmd->name() ); if (!cmdDetails.isEmpty()) cmdDetails += " | "; // separator in case of multiple commands cmdDetails += cmd->details(); @@ -212,7 +212,7 @@ void CWBugDetailsContainer::setLoading( const Bug &bug ) showCommands( bug ); m_bugLoading->setText(i18n( "Retrieving Details for Bug %1\n\n(%2)" ) - .arg( bug.number() ).arg( bug.title() ) ); + .tqarg( bug.number() ).tqarg( bug.title() ) ); m_bugStack->raiseWidget( 1 ); } @@ -224,11 +224,11 @@ void CWBugDetailsContainer::setCacheMiss( const Bug &bug ) TQString msg; if( BugSystem::self()->disconnected() ) msg = i18n( "Bug #%1 (%2) is not available offline." ). - arg( bug.number() ).arg( bug.title() ); + tqarg( bug.number() ).tqarg( bug.title() ); else msg = i18n( "Retrieving details for bug #%1\n" "(%2)" ). - arg( bug.number() ).arg( bug.title() ); + tqarg( bug.number() ).tqarg( bug.title() ); m_bugLoading->setText( msg ); m_bugStack->raiseWidget( 1 ); } diff --git a/kbugbuster/gui/cwbugdetailscontainer.h b/kbugbuster/gui/cwbugdetailscontainer.h index 670d3593..8fedf8bb 100644 --- a/kbugbuster/gui/cwbugdetailscontainer.h +++ b/kbugbuster/gui/cwbugdetailscontainer.h @@ -36,9 +36,10 @@ class CWLoadingWidget; class CWBugDetailsContainer : public CWBugDetailsContainer_Base { Q_OBJECT + TQ_OBJECT public: - CWBugDetailsContainer( TQWidget* parent = 0, const char* name = 0 ); + CWBugDetailsContainer( TQWidget* tqparent = 0, const char* name = 0 ); ~CWBugDetailsContainer(); void setBug( const Bug &, const BugDetails & ); diff --git a/kbugbuster/gui/cwbugdetailscontainer_base.ui b/kbugbuster/gui/cwbugdetailscontainer_base.ui index c5ef87b7..61214c34 100644 --- a/kbugbuster/gui/cwbugdetailscontainer_base.ui +++ b/kbugbuster/gui/cwbugdetailscontainer_base.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>CWBugDetailsContainer_Base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CWBugDetailsContainer_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QWidgetStack" row="1" column="0"> + <widget class="TQWidgetStack" row="1" column="0"> <property name="name"> <cstring>m_bugStack</cstring> </property> @@ -35,7 +35,7 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -61,7 +61,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>20</height> @@ -71,7 +71,7 @@ <string>Bug Title</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_cmdLabel</cstring> </property> @@ -81,7 +81,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -95,7 +95,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_cmdClearBtn</cstring> </property> @@ -114,7 +114,7 @@ <enum>Expanding</enum> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugCloseBtn</cstring> </property> @@ -125,7 +125,7 @@ <string>C&lose...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugCloseSilentlyBtn</cstring> </property> @@ -136,7 +136,7 @@ <string>Close Silentl&y</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugReopenBtn</cstring> </property> @@ -147,7 +147,7 @@ <string>Re&open</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugReassignBtn</cstring> </property> @@ -158,7 +158,7 @@ <string>Re&assign...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugTitleBtn</cstring> </property> @@ -169,7 +169,7 @@ <string>Change &Title...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugSeverityBtn</cstring> </property> @@ -191,7 +191,7 @@ <enum>Expanding</enum> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugReplyBtn</cstring> </property> @@ -202,7 +202,7 @@ <string>&Reply...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugReplyPrivBtn</cstring> </property> @@ -220,7 +220,7 @@ <customwidgets> <customwidget> <class>QWidgetStack</class> - <header location="global">qwidgetstack.h</header> + <header location="global">tqwidgetstack.h</header> <sizehint> <width>-1</width> <height>-1</height> @@ -240,5 +240,5 @@ <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1ddec44f503c0ae2a154410f53d0ed20e2bf6bdb656dd6861dd23d9a66591b0587fd1654235ebded6f0edcd53e419d87ae7b1f4f9b8f906d0bfe012317426a70b07bdc2f3ec77f8ed6b89559061a0343d06a124cc105596482585094bc0ae599b04646c9018926491b2205e140c485cace25755c175d0a967b622ff900b8cc9c7d29af594ea722d589167f813aa852ba07d94b9dce296e883fe7bb163f23896753</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp index 14a601be..edcc442d 100644 --- a/kbugbuster/gui/cwbuglistcontainer.cpp +++ b/kbugbuster/gui/cwbuglistcontainer.cpp @@ -41,8 +41,8 @@ using namespace KBugBusterMainWindow; -CWBugListContainer::CWBugListContainer( TQWidget *parent , const char * name ) - : TQWidget( parent, name ), m_find(0), m_findItem(0) +CWBugListContainer::CWBugListContainer( TQWidget *tqparent , const char * name ) + : TQWidget( tqparent, name ), m_tqfind(0), m_findItem(0) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -68,7 +68,7 @@ CWBugListContainer::CWBugListContainer( TQWidget *parent , const char * name ) m_listBugs->addColumn( i18n( "Number" ) ); m_listBugs->addColumn( i18n( "Age" ) ); m_listBugs->addColumn( i18n( "Title" ), 500 ); // so that the widthmode isn't "Maximum" - m_listBugs->addColumn( i18n( "Status" ) ); + m_listBugs->addColumn( i18n( "tqStatus" ) ); m_listBugs->addColumn( i18n( "Severity" ) ); m_listBugs->addColumn( i18n( "Sender" ), 150 ); // idem. hardcoded widths suck a bit, but... m_listBugs->setAllColumnsShowFocus( true ); @@ -114,7 +114,7 @@ CWBugListContainer::~CWBugListContainer() { m_listBugs->saveLayout( KBBPrefs::instance()->config(), "BugListLayout" ); KBBPrefs::instance()->writeConfig(); - delete m_find; + delete m_tqfind; } void CWBugListContainer::setBugList( const TQString &label, const Bug::List &bugs ) @@ -143,7 +143,7 @@ void CWBugListContainer::setBugList( const TQString &label, const Bug::List &bug } } - m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).arg( label ).arg( noBugs ).arg( noWishes ) ); + m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).tqarg( label ).tqarg( noBugs ).tqarg( noWishes ) ); m_listStack->raiseWidget( 0 ); } @@ -153,13 +153,13 @@ void CWBugListContainer::setBugList( const Package &package, const TQString &com if ( component.isEmpty() ) { if ( package.components().count() > 1 ) - listLabel = i18n( "Product '%1', all components" ).arg( package.name() ); + listLabel = i18n( "Product '%1', all components" ).tqarg( package.name() ); else - listLabel = i18n( "Product '%1'" ).arg( package.name() ); + listLabel = i18n( "Product '%1'" ).tqarg( package.name() ); } else { - listLabel = i18n( "Product '%1', component '%2'" ).arg( package.name(), component ); + listLabel = i18n( "Product '%1', component '%2'" ).tqarg( package.name(), component ); } setBugList( listLabel, bugs ); @@ -208,9 +208,9 @@ void CWBugListContainer::setNoList() void CWBugListContainer::setLoading( const Package &package, const TQString &component ) { if ( component.isEmpty() ) - setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).arg( package.name() ) ); + setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).tqarg( package.name() ) ); else - setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).arg( package.name(), component ) ); + setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).tqarg( package.name(), component ) ); } void CWBugListContainer::setLoading( const TQString &label ) @@ -221,12 +221,12 @@ void CWBugListContainer::setLoading( const TQString &label ) void CWBugListContainer::setCacheMiss( const Package &package ) { - setCacheMiss( i18n( "Package '%1'" ).arg( package.name() ) ); + setCacheMiss( i18n( "Package '%1'" ).tqarg( package.name() ) ); } void CWBugListContainer::setCacheMiss( const TQString &label ) { - m_listLoading->setText( i18n( "%1 is not available offline." ).arg( label ) ); + m_listLoading->setText( i18n( "%1 is not available offline." ).tqarg( label ) ); m_listStack->raiseWidget( 1 ); } @@ -258,12 +258,12 @@ void CWBugListContainer::clearCommand( const TQString &bug ) void CWBugListContainer::searchBugByTitle( int options, const TQString& pattern ) { - m_find = new KFind( pattern, options, this ); + m_tqfind = new KFind( pattern, options, this ); // Connect signals to code which handles highlighting // of found text. - connect(m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ), + connect(m_tqfind, TQT_SIGNAL( highlight( const TQString &, int, int ) ), this, TQT_SLOT( searchHighlight( const TQString &, int, int ) ) ); - connect(m_find, TQT_SIGNAL( findNext() ), this, TQT_SLOT( slotFindNext() ) ); + connect(m_tqfind, TQT_SIGNAL( findNext() ), this, TQT_SLOT( slotFindNext() ) ); m_findItem = (BugLVI *)m_listBugs->firstChild(); if ( options & KFindDialog::FromCursor && m_listBugs->currentItem() ) @@ -279,26 +279,26 @@ void CWBugListContainer::slotFindNext() KFind::Result res = KFind::NoMatch; while( res == KFind::NoMatch && m_findItem ) { - if ( m_find->needData() ) - m_find->setData( m_findItem->text(2) ); + if ( m_tqfind->needData() ) + m_tqfind->setData( m_findItem->text(2) ); // Let KFind inspect the text fragment, and display a dialog if a match is found - res = m_find->find(); + res = m_tqfind->find(); if ( res == KFind::NoMatch ) { - if ( m_find->options() & KFindDialog::FindBackwards ) + if ( m_tqfind->options() & KFindDialog::FindBackwards ) m_findItem = (BugLVI *)m_findItem->itemAbove(); else m_findItem = (BugLVI *)m_findItem->itemBelow(); } } if ( res == KFind::NoMatch ) // i.e. at end - if ( m_find->shouldRestart() ) { + if ( m_tqfind->shouldRestart() ) { m_findItem = (BugLVI *)m_listBugs->firstChild(); slotFindNext(); } else { - delete m_find; - m_find = 0L; + delete m_tqfind; + m_tqfind = 0L; } } diff --git a/kbugbuster/gui/cwbuglistcontainer.h b/kbugbuster/gui/cwbuglistcontainer.h index 9dd1d9bd..0144dd57 100644 --- a/kbugbuster/gui/cwbuglistcontainer.h +++ b/kbugbuster/gui/cwbuglistcontainer.h @@ -35,12 +35,13 @@ class CWLoadingWidget; /** * @author Martijn Klingens */ -class CWBugListContainer : public QWidget +class CWBugListContainer : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CWBugListContainer( TQWidget* parent = 0, const char* name = 0 ); + CWBugListContainer( TQWidget* tqparent = 0, const char* name = 0 ); ~CWBugListContainer(); void setBugList( const Package &package, const TQString &component, const Bug::List &bugs ); @@ -85,7 +86,7 @@ private: TQWidgetStack *m_listStack; KListView *m_listBugs; - KFind *m_find; + KFind *m_tqfind; BugLVI *m_findItem; CWLoadingWidget *m_listLoading; diff --git a/kbugbuster/gui/cwloadingwidget.cpp b/kbugbuster/gui/cwloadingwidget.cpp index 24eb70b9..8bff359d 100644 --- a/kbugbuster/gui/cwloadingwidget.cpp +++ b/kbugbuster/gui/cwloadingwidget.cpp @@ -27,16 +27,16 @@ using namespace KBugBusterMainWindow; -CWLoadingWidget::CWLoadingWidget( WidgetMode mode, TQWidget *parent, +CWLoadingWidget::CWLoadingWidget( WidgetMode mode, TQWidget *tqparent, const char * name ) -: TQFrame( parent, name ) +: TQFrame( tqparent, name ) { init( mode ); } CWLoadingWidget::CWLoadingWidget( const TQString &text, WidgetMode mode, - TQWidget *parent, const char * name ) -: TQFrame( parent, name ) + TQWidget *tqparent, const char * name ) +: TQFrame( tqparent, name ) { init( mode ); setText( text ); @@ -107,7 +107,7 @@ void CWLoadingWidget::setText( const TQString &text ) { m_text = text; updatePixmap(); - repaint(); + tqrepaint(); } void CWLoadingWidget::updatePixmap() @@ -197,9 +197,9 @@ void CWLoadingWidget::updatePixmap() box.setHeight( box.height() + 2 * fheight ); box.setWidth( box.width() + 2 * 10 ); if( box.width() < cr.width() - 2 * boxX ) - box.setWidth( QMIN( cr.width() - 2 * boxX, 500 + 2 * 10 ) ); + box.setWidth( TQMIN( cr.width() - 2 * boxX, 500 + 2 * 10 ) ); if( box.height() < 100 ) - box.setHeight( QMIN( cr.height() - boxY - 2 * fheight - 10, 100 ) ); + box.setHeight( TQMIN( cr.height() - boxY - 2 * fheight - 10, 100 ) ); p.setClipRect( box ); p.fillRect( box, TQBrush( TQColor( 204, 222, 234 ) ) ); @@ -209,7 +209,7 @@ void CWLoadingWidget::updatePixmap() p.setWindow( 0, 0, box.width(), box.height() ); p.drawText( 10, fheight, br.width(), - QMAX( br.height(), box.height() - 2 * fheight ), + TQMAX( br.height(), box.height() - 2 * fheight ), AlignAuto | AlignVCenter | WordBreak, m_text ); } } diff --git a/kbugbuster/gui/cwloadingwidget.h b/kbugbuster/gui/cwloadingwidget.h index 1150f39e..b2f49710 100644 --- a/kbugbuster/gui/cwloadingwidget.h +++ b/kbugbuster/gui/cwloadingwidget.h @@ -30,22 +30,23 @@ namespace KBugBusterMainWindow /** * @author Martijn Klingens */ -class CWLoadingWidget : public QFrame +class CWLoadingWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: /** - * Use WidgetMode to specify the layout for the background images + * Use WidgetMode to specify the tqlayout for the background images * TopFrame loads and uses the logo and horizontal bars, * BottomFrame loads the tools and the translucent block. */ enum WidgetMode { TopFrame = 0, BottomFrame }; - CWLoadingWidget( WidgetMode mode = TopFrame, TQWidget* parent = 0, + CWLoadingWidget( WidgetMode mode = TopFrame, TQWidget* tqparent = 0, const char* name = 0 ); CWLoadingWidget( const TQString &text, WidgetMode mode = TopFrame, - TQWidget* parent = 0, const char* name = 0 ); + TQWidget* tqparent = 0, const char* name = 0 ); ~CWLoadingWidget(); TQString text() const { return m_text; } diff --git a/kbugbuster/gui/cwsearchwidget.cpp b/kbugbuster/gui/cwsearchwidget.cpp index 5a075bb8..7fa6fb48 100644 --- a/kbugbuster/gui/cwsearchwidget.cpp +++ b/kbugbuster/gui/cwsearchwidget.cpp @@ -26,8 +26,8 @@ using namespace KBugBusterMainWindow; -CWSearchWidget::CWSearchWidget( TQWidget *parent , const char * name ) -: CWSearchWidget_Base( parent, name ) +CWSearchWidget::CWSearchWidget( TQWidget *tqparent , const char * name ) +: CWSearchWidget_Base( tqparent, name ) { // Set fonts and margins CWSearchWidget_BaseLayout->setSpacing( KDialog::spacingHint() ); diff --git a/kbugbuster/gui/cwsearchwidget.h b/kbugbuster/gui/cwsearchwidget.h index 108a1872..5539a45a 100644 --- a/kbugbuster/gui/cwsearchwidget.h +++ b/kbugbuster/gui/cwsearchwidget.h @@ -28,9 +28,10 @@ namespace KBugBusterMainWindow class CWSearchWidget : public CWSearchWidget_Base { Q_OBJECT + TQ_OBJECT public: - CWSearchWidget( TQWidget* parent = 0, const char* name = 0 ); + CWSearchWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~CWSearchWidget(); public slots: diff --git a/kbugbuster/gui/cwsearchwidget_base.ui b/kbugbuster/gui/cwsearchwidget_base.ui index c5e9b860..595ffb1c 100644 --- a/kbugbuster/gui/cwsearchwidget_base.ui +++ b/kbugbuster/gui/cwsearchwidget_base.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>CWSearchWidget_Base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CWSearchWidget_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_searchLabel</cstring> </property> @@ -30,7 +30,7 @@ <string>Search</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -55,7 +55,7 @@ <enum>NoInsertion</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel9</cstring> </property> @@ -66,7 +66,7 @@ <cstring>m_searchBugNumber</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout17</cstring> </property> @@ -80,7 +80,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_searchBugNumber</cstring> </property> @@ -93,7 +93,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_searchBugNumberBtn</cstring> </property> @@ -114,7 +114,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -125,7 +125,7 @@ <cstring>m_searchDesc</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout15</cstring> </property> @@ -139,7 +139,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_searchDesc</cstring> </property> @@ -152,7 +152,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_searchDescBtn</cstring> </property> @@ -194,5 +194,5 @@ <includes> <include location="global" impldecl="in declaration">kcombobox.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbugbuster/gui/kbbbookmarkmanager.h b/kbugbuster/gui/kbbbookmarkmanager.h index af58a461..23763300 100644 --- a/kbugbuster/gui/kbbbookmarkmanager.h +++ b/kbugbuster/gui/kbbbookmarkmanager.h @@ -10,7 +10,7 @@ public: static KBookmarkManager * self() { if ( !s_bookmarkManager ) { - TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("kbugbuster/bookmarks.xml")); + TQString bookmarksFile = locateLocal("data", TQString::tqfromLatin1("kbugbuster/bookmarks.xml")); s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile ); } return s_bookmarkManager; diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp index 24730fda..67b3388c 100644 --- a/kbugbuster/gui/kbbmainwindow.cpp +++ b/kbugbuster/gui/kbbmainwindow.cpp @@ -61,8 +61,8 @@ using namespace KBugBusterMainWindow; class TextViewer : public KDialogBase { public: - TextViewer( const TQString &title, TQWidget *parent = 0 ) - : KDialogBase( Plain, title, Ok, Ok, parent, 0, + TextViewer( const TQString &title, TQWidget *tqparent = 0 ) + : KDialogBase( Plain, title, Ok, Ok, tqparent, 0, false ) { TQFrame *topFrame = plainPage(); @@ -144,68 +144,68 @@ KBBMainWindow::~KBBMainWindow() void KBBMainWindow::initActions() { // Prepare and create XML GUI - fileQuit = KStdAction::quit( this, + fileQuit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); fileQuit->setToolTip( i18n( "Quit KBugBuster" ) ); - new KAction( i18n("See &Pending Changes"), "contents", 0, this, TQT_SLOT( slotListChanges() ), + new KAction( i18n("See &Pending Changes"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotListChanges() ), actionCollection(), "file_seechanges" ); - new KAction( i18n("&Submit Changes"), "mail_send", 0, this, TQT_SLOT( slotSubmit() ), + new KAction( i18n("&Submit Changes"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ), actionCollection(), "file_submit" ); - reloadpacklist = new KAction( i18n("Reload &Product List"), "reload", CTRL+Qt::Key_F5, m_mainWidget, TQT_SLOT( slotReloadPackageList() ), + reloadpacklist = new KAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackageList() ), actionCollection(), "reload_packagelist" ); - reloadpack= new KAction( i18n("Reload Bug &List (for current product)"), "reload", Qt::Key_F5, m_mainWidget, TQT_SLOT( slotReloadPackage() ), + reloadpack= new KAction( i18n("Reload Bug &List (for current product)"), "reload", TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackage() ), actionCollection(), "reload_package" ); - reloadbug = new KAction( i18n("Reload Bug &Details (for current bug)"), "reload", SHIFT+Qt::Key_F5, m_mainWidget, TQT_SLOT( slotReloadBug() ), + reloadbug = new KAction( i18n("Reload Bug &Details (for current bug)"), "reload", SHIFT+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadBug() ), actionCollection(), "reload_bug" ); - loadMyBugs = new KAction( i18n( "Load &My Bugs List" ), 0, m_mainWidget, TQT_SLOT( slotLoadMyBugs() ), + loadMyBugs = new KAction( i18n( "Load &My Bugs List" ), 0, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotLoadMyBugs() ), actionCollection(), "load_my_bugs" ); - reloadall = new KAction( i18n("Load All Bug Details (for current product)"), Qt::Key_F6, m_mainWidget, TQT_SLOT( slotRetrieveAllBugDetails() ), actionCollection(), "load_allbugs" ); - new KAction( i18n("Extract &Attachments"), "filesave", Qt::Key_F4, m_mainWidget, TQT_SLOT( slotExtractAttachments() ), + reloadall = new KAction( i18n("Load All Bug Details (for current product)"), TQt::Key_F6, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotRetrieveAllBugDetails() ), actionCollection(), "load_allbugs" ); + new KAction( i18n("Extract &Attachments"), "filesave", TQt::Key_F4, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotExtractAttachments() ), actionCollection(), "extract_attachments" ); - new KAction( i18n("Clear Cache"), 0, this, TQT_SLOT( clearCache() ), + new KAction( i18n("Clear Cache"), 0, TQT_TQOBJECT(this), TQT_SLOT( clearCache() ), actionCollection(), "clear_cache" ); - new KAction( i18n("&Search by Product..."), "goto", CTRL+Qt::Key_P, this, + new KAction( i18n("&Search by Product..."), "goto", CTRL+TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT( searchPackage() ), actionCollection(), "search_package" ); - new KAction( i18n("Search by Bug &Number..."), "filefind", CTRL+Qt::Key_N, this, + new KAction( i18n("Search by Bug &Number..."), "filetqfind", CTRL+TQt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( searchBugNumber() ), actionCollection(), "search_bugnumber" ); // For now "Description" searches by title. Maybe later we can have a // full-text search interfacing bugs.kde.org and rename the current one to "By Title". - new KAction( i18n("Search by &Description...") ,"find", CTRL+Qt::Key_D, this, + new KAction( i18n("Search by &Description...") ,"tqfind", CTRL+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT( searchDescription() ), actionCollection(), "search_description" ); -// new KAction( i18n("&Merge"), "view_remove", CTRL+Qt::Key_M, m_mainWidget, +// new KAction( i18n("&Merge"), "view_remove", CTRL+TQt::Key_M, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( mergeBugs() ), actionCollection(), "cmd_merge" ); -// new KAction( i18n("&Unmerge"), "view_top_bottom", CTRL+SHIFT+Qt::Key_M, m_mainWidget, +// new KAction( i18n("&Unmerge"), "view_top_bottom", CTRL+SHIFT+TQt::Key_M, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( unmergeBugs() ), actionCollection(), "cmd_unmerge" ); - new KAction( i18n("C&lose..."), "edittrash", CTRL+Qt::Key_L, m_mainWidget, + new KAction( i18n("C&lose..."), "edittrash", CTRL+TQt::Key_L, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( closeBug() ), actionCollection(), "cmd_close" ); -// new KAction( i18n("Clos&e Silently"), "edittrash", CTRL+Qt::Key_E, m_mainWidget, +// new KAction( i18n("Clos&e Silently"), "edittrash", CTRL+TQt::Key_E, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( closeBugSilently() ), actionCollection(), "cmd_close_silently" ); - new KAction( i18n("Re&open"), "idea", CTRL+Qt::Key_O, m_mainWidget, + new KAction( i18n("Re&open"), "idea", CTRL+TQt::Key_O, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( reopenBug() ), actionCollection(), "cmd_reopen" ); -// new KAction( i18n("Re&assign..."), "folder_new", CTRL+Qt::Key_A, m_mainWidget, +// new KAction( i18n("Re&assign..."), "folder_new", CTRL+TQt::Key_A, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( reassignBug() ), actionCollection(), "cmd_reassign" ); -// new KAction( i18n("Change &Title..."), "text_under", CTRL+Qt::Key_T, m_mainWidget, +// new KAction( i18n("Change &Title..."), "text_under", CTRL+TQt::Key_T, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( titleBug() ), actionCollection(), "cmd_title" ); -// new KAction( i18n("Change &Severity..."), "edit", CTRL+Qt::Key_S, m_mainWidget, +// new KAction( i18n("Change &Severity..."), "edit", CTRL+TQt::Key_S, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( severityBug() ), actionCollection(), "cmd_severity" ); - new KAction( i18n("&Reply..."), "mail_replyall",CTRL+Qt::Key_R , m_mainWidget, + new KAction( i18n("&Reply..."), "mail_replyall",CTRL+TQt::Key_R , TQT_TQOBJECT(m_mainWidget), TQT_SLOT( replyBug() ), actionCollection(), "cmd_reply" ); - new KAction( i18n("Reply &Privately..."), "mail_reply", CTRL+Qt::Key_I, m_mainWidget, + new KAction( i18n("Reply &Privately..."), "mail_reply", CTRL+TQt::Key_I, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( replyPrivateBug() ), actionCollection(), "cmd_replyprivate" ); - KStdAction::showMenubar(this, TQT_SLOT( slotToggleMenubar() ), actionCollection() ); + KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() ); #if KDE_IS_VERSION( 3, 1, 90 ) createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); #endif m_disconnectedAction = new KToggleAction( i18n("&Disconnected Mode"), 0, - this, + TQT_TQOBJECT(this), TQT_SLOT( slotDisconnectedAction() ), actionCollection(), "settings_disconnected" ); @@ -215,16 +215,16 @@ void KBBMainWindow::initActions() m_pamBookmarks = new KActionMenu( i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" ); m_pBookmarkMenu = new KBookmarkMenu( KBBBookmarkManager::self(), this, m_pamBookmarks->popupMenu(), actionCollection(), true ); - KStdAction::preferences( this, TQT_SLOT(preferences()), actionCollection() ); + KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(preferences()), actionCollection() ); - KToggleAction *toggleTmp = new KToggleAction( i18n("Show Closed Bugs"), "recycled", 0, this, TQT_SLOT( slotToggleDone() ), + KToggleAction *toggleTmp = new KToggleAction( i18n("Show Closed Bugs"), "recycled", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleDone() ), actionCollection(), "cmd_toggle_done" ); #if KDE_IS_VERSION( 3, 2, 90 ) toggleTmp->setCheckedState(i18n("Hide Closed Bugs")); #endif toggleTmp->setChecked( KBBPrefs::instance()->mShowClosedBugs ); - toggleTmp =new KToggleAction( i18n("Show Wishes"), "bookmark", 0, this, TQT_SLOT( slotToggleWishes() ), + toggleTmp =new KToggleAction( i18n("Show Wishes"), "bookmark", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleWishes() ), actionCollection(), "cmd_toggle_wishes" ); #if KDE_IS_VERSION( 3, 2, 90 ) toggleTmp->setCheckedState(i18n("Hide Wishes")); @@ -232,7 +232,7 @@ void KBBMainWindow::initActions() toggleTmp->setChecked(KBBPrefs::instance()->mShowWishes); mSelectServerAction = new KSelectAction( i18n( "Select Server" ), 0, 0, - this, + TQT_TQOBJECT(this), TQT_SLOT( slotSelectServer() ), actionCollection(), "select_server" ); @@ -240,10 +240,10 @@ void KBBMainWindow::initActions() setupSelectServerAction(); if ( KBBPrefs::instance()->mDebugMode ) { - new KAction( i18n("Show Last Server Response..."), 0 , this, + new KAction( i18n("Show Last Server Response..."), 0 , TQT_TQOBJECT(this), TQT_SLOT( showLastResponse() ), actionCollection(), "debug_lastresponse" ); - new KAction( i18n("Show Bug HTML Source..."), 0 , this, + new KAction( i18n("Show Bug HTML Source..."), 0 , TQT_TQOBJECT(this), TQT_SLOT( showBugSource() ), actionCollection(), "debug_showbugsource" ); } @@ -342,7 +342,7 @@ void KBBMainWindow::slotListChanges() if (list.count() > 0) { int ret = KMessageBox::questionYesNoList( this, i18n("List of pending commands:"), - list, TQString::null, KStdGuiItem::clear(), KStdGuiItem::close() ); + list, TQString(), KStdGuiItem::clear(), KStdGuiItem::close() ); if ( ret == KMessageBox::Yes ) { // Ask for confirmation, it's too easy to click the wrong button in the above dlg box @@ -391,7 +391,7 @@ void KBBMainWindow::searchBugNumber() bool ok = false; TQString result = KInputDialog::getText( i18n("Search for Bug Number"), i18n("Please enter a bug number:"), - TQString::null, &ok, this ); + TQString(), &ok, this ); if ( ok ) { //Strip whitespace and # if needed result = result.stripWhiteSpace(); @@ -420,7 +420,7 @@ bool KBBMainWindow::queryClose() if ( ! BugSystem::self()->server()->commandsPending() ) return true; int result = KMessageBox::warningYesNoCancel(this,i18n("There are unsent bug commands." - " Do you want to send them now?"), TQString::null, i18n("Send"), i18n("Do Not Send")); + " Do you want to send them now?"), TQString(), i18n("Send"), i18n("Do Not Send")); if ( result == KMessageBox::Cancel ) return false; if ( result == KMessageBox::Yes ) { BugSystem::self()->sendCommands(); diff --git a/kbugbuster/gui/kbbmainwindow.h b/kbugbuster/gui/kbbmainwindow.h index 2e86c596..9cb7d2f2 100644 --- a/kbugbuster/gui/kbbmainwindow.h +++ b/kbugbuster/gui/kbbmainwindow.h @@ -48,6 +48,7 @@ namespace KBugBusterMainWindow class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner { Q_OBJECT + TQ_OBJECT public: /** * construtor of KBugBusterApp, calls all init functions to create the application. @@ -55,7 +56,7 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner KBBMainWindow( const TQCString &initialPackage = "", const TQCString &initialCpomponent = "", const TQCString &initialBug = "", - TQWidget* parent = 0, const char* name = 0 ); + TQWidget* tqparent = 0, const char* name = 0 ); ~KBBMainWindow(); /// Overloaded functions of KBookmarkOwner @@ -119,7 +120,7 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner KToggleAction *m_disconnectedAction; /** - * Status bar label. We need this, because the default Qt version doesn't + * tqStatus bar label. We need this, because the default TQt version doesn't * support rich text in the messages */ TQLabel *m_statusLabel; diff --git a/kbugbuster/gui/loadallbugsdlg.cpp b/kbugbuster/gui/loadallbugsdlg.cpp index d6203c07..72212ccd 100644 --- a/kbugbuster/gui/loadallbugsdlg.cpp +++ b/kbugbuster/gui/loadallbugsdlg.cpp @@ -26,7 +26,7 @@ LoadAllBugsDlg::LoadAllBugsDlg( const Package& pkg, const TQString &component ) m_bugLoadingProgress = new KIO::DefaultProgress( this ); connect( m_bugLoadingProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotStopped() ) ); - setCaption( i18n( "Loading All Bugs for Product %1" ).arg( pkg.name() ) ); + setCaption( i18n( "Loading All Bugs for Product %1" ).tqarg( pkg.name() ) ); connect( BugSystem::self(), TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), TQT_SLOT( slotBugDetailsAvailable( const Bug &, const BugDetails & ) ) ); @@ -45,7 +45,7 @@ LoadAllBugsDlg::LoadAllBugsDlg( const Package& pkg, const TQString &component ) void LoadAllBugsDlg::slotBugDetailsAvailable( const Bug &bug, const BugDetails & ) { kdDebug() << "LoadAllBugsDlg::slotBugDetailsAvailable " << bug.number() << endl; - m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).arg(bug.number()) ); + m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).tqarg(bug.number()) ); loadNextBug(); } diff --git a/kbugbuster/gui/loadallbugsdlg.h b/kbugbuster/gui/loadallbugsdlg.h index cc7c0661..6b37bbc1 100644 --- a/kbugbuster/gui/loadallbugsdlg.h +++ b/kbugbuster/gui/loadallbugsdlg.h @@ -22,9 +22,10 @@ class BugDetails; namespace KIO { class DefaultProgress; } -class LoadAllBugsDlg : public QDialog +class LoadAllBugsDlg : public TQDialog { Q_OBJECT + TQ_OBJECT public: LoadAllBugsDlg( const Package& pkg, const TQString &component ); diff --git a/kbugbuster/gui/messageeditor.cpp b/kbugbuster/gui/messageeditor.cpp index 865ec3da..5ef266ff 100644 --- a/kbugbuster/gui/messageeditor.cpp +++ b/kbugbuster/gui/messageeditor.cpp @@ -14,8 +14,8 @@ #include <tqpushbutton.h> #include "messageeditor.moc" -MessageEditor::MessageEditor( TQWidget *parent ) - : KDialogBase(Plain,i18n("Edit Message Buttons"),Ok|Cancel,Ok,parent,0, +MessageEditor::MessageEditor( TQWidget *tqparent ) + : KDialogBase(Plain,i18n("Edit Message Buttons"),Ok|Cancel,Ok,tqparent,0, true,true) { TQFrame *topFrame = plainPage(); @@ -63,7 +63,7 @@ void MessageEditor::addButton() { TQString txt; txt = KInputDialog::getText(i18n("Add Message Button"), - i18n("Enter button name:"), TQString::null, + i18n("Enter button name:"), TQString(), NULL, this ); if ( !txt.isNull() ) { @@ -79,7 +79,7 @@ void MessageEditor::addButton() void MessageEditor::removeButton() { int result = KMessageBox::warningContinueCancel(this, - i18n("Remove the button %1?").arg(mSelectionCombo->currentText()), + i18n("Remove the button %1?").tqarg(mSelectionCombo->currentText()), i18n("Remove"), KGuiItem( i18n("Delete"), "editdelete") ); if (result == KMessageBox::Continue) { @@ -105,7 +105,7 @@ void MessageEditor::updateMessage() void MessageEditor::saveMessage() { - mMessageButtons.replace(mCurrentButton,mMessageEdit->text()); + mMessageButtons.tqreplace(mCurrentButton,mMessageEdit->text()); } void MessageEditor::slotOk() diff --git a/kbugbuster/gui/messageeditor.h b/kbugbuster/gui/messageeditor.h index 306cc3d0..de004511 100644 --- a/kbugbuster/gui/messageeditor.h +++ b/kbugbuster/gui/messageeditor.h @@ -8,8 +8,9 @@ class KTextEdit; class MessageEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - MessageEditor( TQWidget *parent ); + MessageEditor( TQWidget *tqparent ); protected slots: void slotOk(); diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp index 8d12cc35..b84e269f 100644 --- a/kbugbuster/gui/msginputdialog.cpp +++ b/kbugbuster/gui/msginputdialog.cpp @@ -20,8 +20,8 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug, const Package &package, const TQString "edMsg, - TQWidget *parent) - : KDialogBase(Plain,TQString::null,User1|User2|Ok|Cancel,Ok,parent,0,false, + TQWidget *tqparent) + : KDialogBase(Plain,TQString(),User1|User2|Ok|Cancel,Ok,tqparent,0,false, true,KStdGuiItem::clear(),i18n( "&Edit Presets..." )), mBug( bug ), mPackage( package ), @@ -29,7 +29,7 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug, { switch ( mType ) { case Close: - setCaption( i18n("Close Bug %1").arg( mBug.number() ) ); + setCaption( i18n("Close Bug %1").tqarg( mBug.number() ) ); break; case Reply: setCaption( i18n("Reply to Bug") ); @@ -44,30 +44,30 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug, TQFrame *topFrame = plainPage(); ( new TQHBoxLayout( topFrame ) )->setAutoAdd( true ); - mSplitter = new TQSplitter( TQSplitter::Horizontal, topFrame ); + mSplitter = new TQSplitter( Qt::Horizontal, topFrame ); TQWidget *w = new TQWidget( mSplitter ); ( new TQVBoxLayout( w, spacingHint(), -1 ) )->setAutoAdd( true ); if ( mType == Reply ) { TQWidget *r = new TQWidget( w ); - TQHBoxLayout* rlayout = new TQHBoxLayout( r ); + TQHBoxLayout* rtqlayout = new TQHBoxLayout( r ); TQLabel *rlabel = new TQLabel( i18n("&Recipient:"),r ); TQFont f = r->font(); f.setBold( true ); r->setFont( f ); - rlayout->add( rlabel ); + rtqlayout->add( rlabel ); mRecipient = new TQComboBox( r ); mRecipient->insertItem( i18n("Normal (bugs.kde.org & Maintainer & kde-bugs-dist)"), BugCommand::Normal ); mRecipient->insertItem( i18n("Maintonly (bugs.kde.org & Maintainer)"), BugCommand::Maintonly ); mRecipient->insertItem( i18n("Quiet (bugs.kde.org only)"), BugCommand::Quiet ); rlabel->setBuddy( mRecipient ); - rlayout->add( mRecipient ); + rtqlayout->add( mRecipient ); TQSpacerItem *rspacer= new TQSpacerItem( 1,1,TQSizePolicy::Expanding ); - rlayout->addItem( rspacer ); + rtqlayout->addItem( rspacer ); // Reply currently only replies to the bug tracking system r->hide(); diff --git a/kbugbuster/gui/msginputdialog.h b/kbugbuster/gui/msginputdialog.h index 0ba59008..996a46ef 100644 --- a/kbugbuster/gui/msginputdialog.h +++ b/kbugbuster/gui/msginputdialog.h @@ -13,11 +13,12 @@ class KListBox; class MsgInputDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum MessageType{ Close, Reply, ReplyPrivate }; MsgInputDialog( MessageType, const Bug &, const Package &, - const TQString &, TQWidget *parent=0); + const TQString &, TQWidget *tqparent=0); virtual ~MsgInputDialog(); TQString message() const; diff --git a/kbugbuster/gui/packagelvi.cpp b/kbugbuster/gui/packagelvi.cpp index 6374fe29..d432d312 100644 --- a/kbugbuster/gui/packagelvi.cpp +++ b/kbugbuster/gui/packagelvi.cpp @@ -16,15 +16,15 @@ #include "packagelvi.h" -PackageLVI::PackageLVI( TQListView *parent , const Package &pkg, const TQString &component ) -: TQListViewItem( parent, pkg.name(), pkg.description() ) +PackageLVI::PackageLVI( TQListView *tqparent , const Package &pkg, const TQString &component ) +: TQListViewItem( tqparent, pkg.name(), pkg.description() ) { m_package = pkg; m_component = component; } -PackageLVI::PackageLVI( TQListViewItem *parent , const Package &pkg, const TQString &component ) -: TQListViewItem( parent, component ) +PackageLVI::PackageLVI( TQListViewItem *tqparent , const Package &pkg, const TQString &component ) +: TQListViewItem( tqparent, component ) { m_package = pkg; m_component = component; diff --git a/kbugbuster/gui/packagelvi.h b/kbugbuster/gui/packagelvi.h index 5582e06e..435c1331 100644 --- a/kbugbuster/gui/packagelvi.h +++ b/kbugbuster/gui/packagelvi.h @@ -24,13 +24,13 @@ /** * @author Martijn Klingens */ -class PackageLVI : public QListViewItem +class PackageLVI : public TQListViewItem { public: // Top-level package - PackageLVI( TQListView *parent , const Package &pkg, const TQString &component ); + PackageLVI( TQListView *tqparent , const Package &pkg, const TQString &component ); // Child component - PackageLVI( TQListViewItem *parent , const Package &pkg, const TQString &component ); + PackageLVI( TQListViewItem *tqparent , const Package &pkg, const TQString &component ); ~PackageLVI(); diff --git a/kbugbuster/gui/packageselectdialog.cpp b/kbugbuster/gui/packageselectdialog.cpp index 31dfdcef..e3481c0b 100644 --- a/kbugbuster/gui/packageselectdialog.cpp +++ b/kbugbuster/gui/packageselectdialog.cpp @@ -14,10 +14,10 @@ #include "packageselectdialog.h" #include "packageselectdialog.moc" -PackageListView::PackageListView( TQWidget *parent ) : - TQListView( parent ) +PackageListView::PackageListView( TQWidget *tqparent ) : + TQListView( tqparent ) { - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); } void PackageListView::resetTyped() @@ -39,14 +39,14 @@ void PackageListView::keyPressEvent( TQKeyEvent *e ) emit typed( mTyped ); } -PackageSelectDialog::PackageSelectDialog(TQWidget *parent,const char *name) : - KDialogBase( parent, name, true, i18n("Select Product"), Ok|Cancel ) +PackageSelectDialog::PackageSelectDialog(TQWidget *tqparent,const char *name) : + KDialogBase( tqparent, name, true, i18n("Select Product"), Ok|Cancel ) { TQWidget *topWidget = new TQWidget( this ); setMainWidget( topWidget ); TQBoxLayout *topLayout = new TQVBoxLayout( topWidget ); - TQSplitter *topSplitter = new TQSplitter( TQSplitter::Vertical, topWidget ); + TQSplitter *topSplitter = new TQSplitter( Qt::Vertical, topWidget ); topSplitter->setOpaqueResize( true ); topLayout->addWidget( topSplitter ); @@ -108,7 +108,7 @@ void PackageSelectDialog::setPackages( const Package::List &pkgs ) mCompletionDict.clear(); Package::List::ConstIterator it; for( it = pkgs.begin(); it != pkgs.end(); ++it ) { - PackageLVI *item = new PackageLVI( mCompleteList, (*it), TQString::null ); + PackageLVI *item = new PackageLVI( mCompleteList, (*it), TQString() ); TQStringList components = (*it).components(); if (components.count() > 1) { @@ -131,7 +131,7 @@ void PackageSelectDialog::recentSelected( int, TQListViewItem *item ) kdDebug() << "PackageSelectDialog::recentSelected()" << endl; if ( item ) { mCompleteList->clearSelection(); - // Why does a QLineEdit->setText() call emit the textChanged() signal? + // Why does a TQLineEdit->setText() call emit the textChanged() signal? mPackageEdit->blockSignals( true ); mPackageEdit->setText( item->text( 0 ) ); enableButtonOK(true); @@ -169,7 +169,7 @@ void PackageSelectDialog::slotOk() BugServer *server = BugSystem::self()->server(); TQStringList recent = server->serverConfig().recentPackages(); - if( !recent.contains( recent_key ) ) { + if( !recent.tqcontains( recent_key ) ) { recent.prepend( recent_key ); if ( int( recent.count() ) > KBBPrefs::instance()->mRecentPackagesCount ) { recent.remove( recent.last() ); diff --git a/kbugbuster/gui/packageselectdialog.h b/kbugbuster/gui/packageselectdialog.h index 471fe8b5..a3ab9b59 100644 --- a/kbugbuster/gui/packageselectdialog.h +++ b/kbugbuster/gui/packageselectdialog.h @@ -10,11 +10,12 @@ class KCompletion; class KLineEdit; -class PackageListView : public QListView +class PackageListView : public TQListView { Q_OBJECT + TQ_OBJECT public: - PackageListView( TQWidget *parent ); + PackageListView( TQWidget *tqparent ); void resetTyped(); @@ -31,8 +32,9 @@ class PackageListView : public QListView class PackageSelectDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PackageSelectDialog(TQWidget *parent=0,const char *name=0); + PackageSelectDialog(TQWidget *tqparent=0,const char *name=0); ~PackageSelectDialog(); void setRecentPackages( const TQStringList & ); diff --git a/kbugbuster/gui/preferencesdialog.cpp b/kbugbuster/gui/preferencesdialog.cpp index 2af4879a..2b6f09ab 100644 --- a/kbugbuster/gui/preferencesdialog.cpp +++ b/kbugbuster/gui/preferencesdialog.cpp @@ -24,7 +24,7 @@ #include "preferencesdialog.h" -class ServerItem : public QListViewItem +class ServerItem : public TQListViewItem { public: ServerItem( TQListView *listView, const BugServerConfig &cfg ) @@ -48,10 +48,10 @@ class ServerItem : public QListViewItem BugServerConfig mServerConfig; }; -class ServerListView : public QListView +class ServerListView : public TQListView { public: - ServerListView( TQWidget *parent ) : TQListView( parent ) + ServerListView( TQWidget *tqparent ) : TQListView( tqparent ) { addColumn( i18n("Name") ); addColumn( i18n("Base URL") ); @@ -60,9 +60,9 @@ class ServerListView : public QListView } }; -PreferencesDialog::PreferencesDialog( TQWidget* parent, const char* name ) +PreferencesDialog::PreferencesDialog( TQWidget* tqparent, const char* name ) : KDialogBase ( IconList, i18n("Preferences"), Ok|Apply|Cancel, Ok, - parent, name, false, true ) + tqparent, name, false, true ) { setupServerPage(); setupAdvancedPage(); @@ -79,15 +79,15 @@ void PreferencesDialog::setupServerPage() TQFrame *topFrame = addPage( i18n("Servers"), 0, DesktopIcon( "gohome", KIcon::SizeMedium ) ); - TQBoxLayout *layout = new TQVBoxLayout( topFrame ); - layout->setSpacing( spacingHint() ); + TQBoxLayout *tqlayout = new TQVBoxLayout( topFrame ); + tqlayout->setSpacing( spacingHint() ); mServerList = new ServerListView( topFrame ); - layout->addWidget( mServerList ); + tqlayout->addWidget( mServerList ); TQHBox *buttonBox = new TQHBox( topFrame ); buttonBox->setSpacing( spacingHint() ); - layout->addWidget( buttonBox ); + tqlayout->addWidget( buttonBox ); TQPushButton *addButton = new TQPushButton( i18n("Add Server..."), buttonBox ); connect( addButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addServer() ) ); @@ -100,7 +100,7 @@ void PreferencesDialog::setupServerPage() TQPushButton *button = new TQPushButton( i18n("Select Server From List..."), topFrame ); - layout->addWidget( button ); + tqlayout->addWidget( button ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( selectServer() ) ); connect( mServerList, TQT_SIGNAL( doubleClicked ( TQListViewItem *)), this, TQT_SLOT( editServer())); } @@ -110,34 +110,34 @@ void PreferencesDialog::setupAdvancedPage() TQFrame *topFrame = addPage( i18n("Advanced"), 0, DesktopIcon( "misc", KIcon::SizeMedium ) ); - TQBoxLayout *layout = new TQVBoxLayout( topFrame ); - layout->setSpacing( spacingHint() ); + TQBoxLayout *tqlayout = new TQVBoxLayout( topFrame ); + tqlayout->setSpacing( spacingHint() ); - TQButtonGroup *mailGroup = new TQButtonGroup( 1, Horizontal, + TQButtonGroup *mailGroup = new TQButtonGroup( 1,Qt::Horizontal, i18n( "Mail Client" ), topFrame ); - layout->addWidget( mailGroup ); + tqlayout->addWidget( mailGroup ); mKMailButton = new TQRadioButton( i18n( "&KMail" ), mailGroup ); mDirectButton = new TQRadioButton( i18n( "D&irect" ), mailGroup ); mSendmailButton = new TQRadioButton( i18n( "&Sendmail" ), mailGroup ); mShowClosedCheckBox = new TQCheckBox( i18n( "Show closed bugs" ), topFrame ); - layout->addWidget( mShowClosedCheckBox ); + tqlayout->addWidget( mShowClosedCheckBox ); mShowWishesCheckBox = new TQCheckBox( i18n( "Show wishes" ), topFrame ); - layout->addWidget( mShowWishesCheckBox ); + tqlayout->addWidget( mShowWishesCheckBox ); mShowVotedCheckBox = new TQCheckBox( i18n( "Show bugs with number of votes greater than:" ), topFrame ); - layout->addWidget( mShowVotedCheckBox ); + tqlayout->addWidget( mShowVotedCheckBox ); mMinVotesInput = new KIntNumInput( topFrame ); mMinVotesInput->setMinValue( 0 ); connect( mShowVotedCheckBox, TQT_SIGNAL(toggled(bool)), mMinVotesInput, TQT_SLOT(setEnabled(bool)) ); - layout->addWidget( mMinVotesInput ); + tqlayout->addWidget( mMinVotesInput ); mSendBccCheckBox = new TQCheckBox( i18n( "Send BCC to myself" ), topFrame ); - layout->addWidget( mSendBccCheckBox ); + tqlayout->addWidget( mSendBccCheckBox ); } void PreferencesDialog::setDefaults() @@ -274,21 +274,21 @@ void PreferencesDialog::writeConfig() emit configChanged(); } -SelectServerDlg::SelectServerDlg(PreferencesDialog *parent, const char */*name*/ ) - :KDialogBase(parent, 0, true, i18n("Select Server"), +SelectServerDlg::SelectServerDlg(PreferencesDialog *tqparent, const char */*name*/ ) + :KDialogBase(tqparent, 0, true, i18n("Select Server"), KDialogBase::Ok | KDialogBase::Cancel) { list = new ServerListView(this ); setMainWidget( list ); - parent->createServerItem( list, "KDE", "http://bugs.kde.org", "KDE" ); - parent->createServerItem( list, "GNOME", "http://bugzilla.gnome.org", "2.10" ); - parent->createServerItem( list, "Mozilla", "http://bugzilla.mozilla.org", "2.17.1" ); - parent->createServerItem( list, "Apache", "http://nagoya.apache.org/bugzilla/", "2.14.2" ); - parent->createServerItem( list, "XFree86", "http://bugs.xfree86.org/cgi-bin/bugzilla/", "2.14.2" ); - parent->createServerItem( list, "Ximian", "http://bugzilla.ximian.com", "2.10" ); - parent->createServerItem( list, "RedHat", "http://bugzilla.redhat.com/bugzilla/", "2.17.1" ); - parent->createServerItem( list, "Mandriva", "http://qa.mandriva.com/", "2.17.4" ); + tqparent->createServerItem( list, "KDE", "http://bugs.kde.org", "KDE" ); + tqparent->createServerItem( list, "GNOME", "http://bugzilla.gnome.org", "2.10" ); + tqparent->createServerItem( list, "Mozilla", "http://bugzilla.mozilla.org", "2.17.1" ); + tqparent->createServerItem( list, "Apache", "http://nagoya.apache.org/bugzilla/", "2.14.2" ); + tqparent->createServerItem( list, "XFree86", "http://bugs.xfree86.org/cgi-bin/bugzilla/", "2.14.2" ); + tqparent->createServerItem( list, "Ximian", "http://bugzilla.ximian.com", "2.10" ); + tqparent->createServerItem( list, "RedHat", "http://bugzilla.redhat.com/bugzilla/", "2.17.1" ); + tqparent->createServerItem( list, "Mandriva", "http://qa.mandriva.com/", "2.17.4" ); connect( list, TQT_SIGNAL( doubleClicked ( TQListViewItem *)), this, TQT_SLOT( slotDoubleClicked( TQListViewItem *))); } diff --git a/kbugbuster/gui/preferencesdialog.h b/kbugbuster/gui/preferencesdialog.h index 89dd7512..209a084c 100644 --- a/kbugbuster/gui/preferencesdialog.h +++ b/kbugbuster/gui/preferencesdialog.h @@ -13,8 +13,9 @@ class ServerListView; class PreferencesDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PreferencesDialog( TQWidget* parent = 0, const char* name = 0 ); + PreferencesDialog( TQWidget* tqparent = 0, const char* name = 0 ); ~PreferencesDialog(); void createServerItem( ServerListView *listView, const TQString &name, @@ -62,8 +63,9 @@ class ServerItem; class SelectServerDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SelectServerDlg(PreferencesDialog *parent, const char */*name*/ ); + SelectServerDlg(PreferencesDialog *tqparent, const char */*name*/ ); ServerItem *serverSelected(); protected slots: void slotDoubleClicked( TQListViewItem *); diff --git a/kbugbuster/gui/serverconfigdialog.cpp b/kbugbuster/gui/serverconfigdialog.cpp index feaab83d..99cb28f3 100644 --- a/kbugbuster/gui/serverconfigdialog.cpp +++ b/kbugbuster/gui/serverconfigdialog.cpp @@ -12,8 +12,8 @@ #include <tqvbox.h> #include <tqcombobox.h> -ServerConfigDialog::ServerConfigDialog( TQWidget *parent, const char *name ) : - KDialogBase( parent, name, true, i18n("Edit Bugzilla Server"), Ok|Cancel ) +ServerConfigDialog::ServerConfigDialog( TQWidget *tqparent, const char *name ) : + KDialogBase( tqparent, name, true, i18n("Edit Bugzilla Server"), Ok|Cancel ) { TQWidget *topFrame = makeMainWidget(); diff --git a/kbugbuster/gui/serverconfigdialog.h b/kbugbuster/gui/serverconfigdialog.h index f4b3c2ba..39a0d596 100644 --- a/kbugbuster/gui/serverconfigdialog.h +++ b/kbugbuster/gui/serverconfigdialog.h @@ -11,8 +11,9 @@ class TQComboBox; class ServerConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ServerConfigDialog( TQWidget *parent = 0 , const char *name = 0 ); + ServerConfigDialog( TQWidget *tqparent = 0 , const char *name = 0 ); void setServerConfig( const BugServerConfig & ); BugServerConfig serverConfig(); diff --git a/kbugbuster/gui/severityselectdialog.cpp b/kbugbuster/gui/severityselectdialog.cpp index 0ef4e2f7..c21a5383 100644 --- a/kbugbuster/gui/severityselectdialog.cpp +++ b/kbugbuster/gui/severityselectdialog.cpp @@ -10,10 +10,10 @@ #include "severityselectdialog.h" #include "severityselectdialog.moc" -SeveritySelectDialog::SeveritySelectDialog(TQWidget *parent,const char *name) : - KDialogBase( parent, name, true, i18n("Select Severity"), Ok|Cancel ) +SeveritySelectDialog::SeveritySelectDialog(TQWidget *tqparent,const char *name) : + KDialogBase( tqparent, name, true, i18n("Select Severity"), Ok|Cancel ) { - mButtonGroup = new TQButtonGroup( 1, Horizontal, i18n("Severity"), this ); + mButtonGroup = new TQButtonGroup( 1,Qt::Horizontal, i18n("Severity"), this ); setMainWidget( mButtonGroup ); TQValueList<Bug::Severity> severities = Bug::severities(); diff --git a/kbugbuster/gui/severityselectdialog.h b/kbugbuster/gui/severityselectdialog.h index 150123cd..778f2900 100644 --- a/kbugbuster/gui/severityselectdialog.h +++ b/kbugbuster/gui/severityselectdialog.h @@ -8,8 +8,9 @@ class SeveritySelectDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SeveritySelectDialog(TQWidget *parent=0,const char *name=0); + SeveritySelectDialog(TQWidget *tqparent=0,const char *name=0); void setSeverity( Bug::Severity ); diff --git a/kbugbuster/kresources/kcalresource.cpp b/kbugbuster/kresources/kcalresource.cpp index 5af8b8be..dd858f18 100644 --- a/kbugbuster/kresources/kcalresource.cpp +++ b/kbugbuster/kresources/kcalresource.cpp @@ -212,7 +212,7 @@ void KCalResource::slotBugListAvailable( const Package &, const TQString &, newTodo = new KCal::Todo; newTodo->setUid( uid ); TQString uri = "http://bugs.kde.org/show_bug.cgi?id=%1"; - newTodo->addAttachment( new KCal::Attachment( uri.arg( bug.number() ) ) ); + newTodo->addAttachment( new KCal::Attachment( uri.tqarg( bug.number() ) ) ); todo = newTodo; } diff --git a/kbugbuster/kresources/kcalresource.h b/kbugbuster/kresources/kcalresource.h index b9683d7e..b852fa26 100644 --- a/kbugbuster/kresources/kcalresource.h +++ b/kbugbuster/kresources/kcalresource.h @@ -51,6 +51,7 @@ class ResourcePrefs; class KCalResource : public KCal::ResourceCached { Q_OBJECT + TQ_OBJECT friend class KCalResourceConfig; diff --git a/kbugbuster/kresources/kcalresourceconfig.cpp b/kbugbuster/kresources/kcalresourceconfig.cpp index 58466642..3ed92e54 100644 --- a/kbugbuster/kresources/kcalresourceconfig.cpp +++ b/kbugbuster/kresources/kcalresourceconfig.cpp @@ -34,8 +34,8 @@ #include "resourceprefs.h" #include "kcalresourceconfig.h" -KCalResourceConfig::KCalResourceConfig( TQWidget* parent, const char* name ) - : KRES::ConfigWidget( parent, name ) +KCalResourceConfig::KCalResourceConfig( TQWidget* tqparent, const char* name ) + : KRES::ConfigWidget( tqparent, name ) { resize( 245, 115 ); diff --git a/kbugbuster/kresources/kcalresourceconfig.h b/kbugbuster/kresources/kcalresourceconfig.h index 6a83ad67..de8eb4d2 100644 --- a/kbugbuster/kresources/kcalresourceconfig.h +++ b/kbugbuster/kresources/kcalresourceconfig.h @@ -34,8 +34,9 @@ class KLineEdit; class KCalResourceConfig : public KRES::ConfigWidget { Q_OBJECT + TQ_OBJECT public: - KCalResourceConfig( TQWidget *parent = 0, const char *name = 0 ); + KCalResourceConfig( TQWidget *tqparent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource ); |