summaryrefslogtreecommitdiffstats
path: root/kbugbuster
diff options
context:
space:
mode:
Diffstat (limited to 'kbugbuster')
-rw-r--r--kbugbuster/backend/bug.cpp36
-rw-r--r--kbugbuster/backend/bug.h16
-rw-r--r--kbugbuster/backend/bugcache.cpp2
-rw-r--r--kbugbuster/backend/bugcommand.h20
-rw-r--r--kbugbuster/backend/bugdetails.cpp4
-rw-r--r--kbugbuster/backend/bugdetailsjob.cpp4
-rw-r--r--kbugbuster/backend/bugimpl.h4
-rw-r--r--kbugbuster/backend/buglistjob.cpp4
-rw-r--r--kbugbuster/backend/bugmybugsjob.cpp2
-rw-r--r--kbugbuster/backend/bugserver.cpp6
-rw-r--r--kbugbuster/backend/bugserver.h2
-rw-r--r--kbugbuster/backend/domprocessor.cpp8
-rw-r--r--kbugbuster/backend/htmlparser.cpp2
-rw-r--r--kbugbuster/backend/mailsender.cpp36
-rw-r--r--kbugbuster/backend/person.cpp4
-rw-r--r--kbugbuster/backend/processor.cpp2
-rw-r--r--kbugbuster/backend/rdfprocessor.cpp4
-rw-r--r--kbugbuster/backend/smtp.cpp6
-rw-r--r--kbugbuster/gui/buglvi.cpp2
-rw-r--r--kbugbuster/gui/centralwidget.cpp8
-rw-r--r--kbugbuster/gui/cwbugdetails.cpp46
-rw-r--r--kbugbuster/gui/cwbugdetailscontainer.cpp22
-rw-r--r--kbugbuster/gui/cwbugdetailscontainer_base.ui2
-rw-r--r--kbugbuster/gui/cwbuglistcontainer.cpp18
-rw-r--r--kbugbuster/gui/cwloadingwidget.cpp2
-rw-r--r--kbugbuster/gui/cwloadingwidget.h2
-rw-r--r--kbugbuster/gui/cwsearchwidget.cpp2
-rw-r--r--kbugbuster/gui/kbbbookmarkmanager.h2
-rw-r--r--kbugbuster/gui/kbbmainwindow.cpp4
-rw-r--r--kbugbuster/gui/kbbmainwindow.h2
-rw-r--r--kbugbuster/gui/loadallbugsdlg.cpp4
-rw-r--r--kbugbuster/gui/messageeditor.cpp4
-rw-r--r--kbugbuster/gui/msginputdialog.cpp12
-rw-r--r--kbugbuster/gui/packageselectdialog.cpp2
-rw-r--r--kbugbuster/gui/preferencesdialog.cpp28
-rw-r--r--kbugbuster/gui/serverconfigdialog.cpp2
-rw-r--r--kbugbuster/gui/severityselectdialog.cpp2
-rw-r--r--kbugbuster/kresources/kcalresource.cpp2
-rw-r--r--kbugbuster/kresources/kcalresourceconfig.cpp2
39 files changed, 166 insertions, 166 deletions
diff --git a/kbugbuster/backend/bug.cpp b/kbugbuster/backend/bug.cpp
index c2328122..ec249ef7 100644
--- a/kbugbuster/backend/bug.cpp
+++ b/kbugbuster/backend/bug.cpp
@@ -56,16 +56,16 @@ TQString Bug::severityLabel( Bug::Severity s )
TQString Bug::severityToString( Bug::Severity s )
{
switch ( s ) {
- case Critical: return TQString::tqfromLatin1( "critical" );
- case Grave: return TQString::tqfromLatin1( "grave" );
- case Major: return TQString::tqfromLatin1( "major" );
- case Crash: return TQString::tqfromLatin1( "crash" );
- case Normal: return TQString::tqfromLatin1( "normal" );
- case Minor: return TQString::tqfromLatin1( "minor" );
- case Wishlist: return TQString::tqfromLatin1( "wishlist" );
+ case Critical: return TQString::fromLatin1( "critical" );
+ case Grave: return TQString::fromLatin1( "grave" );
+ case Major: return TQString::fromLatin1( "major" );
+ case Crash: return TQString::fromLatin1( "crash" );
+ case Normal: return TQString::fromLatin1( "normal" );
+ case Minor: return TQString::fromLatin1( "minor" );
+ case Wishlist: return TQString::fromLatin1( "wishlist" );
default:
kdWarning() << "Bug::severityToString invalid severity " << s << endl;
- return TQString::tqfromLatin1( "<invalid>" );
+ return TQString::fromLatin1( "<invalid>" );
}
}
@@ -95,7 +95,7 @@ TQValueList<Bug::Severity> Bug::severities()
return s;
}
-TQString Bug::statusLabel( Bug::tqStatus s )
+TQString Bug::statusLabel( Bug::Status s )
{
switch ( s )
{
@@ -109,21 +109,21 @@ TQString Bug::statusLabel( Bug::tqStatus s )
}
}
-TQString Bug::statusToString( Bug::tqStatus s )
+TQString Bug::statusToString( Bug::Status s )
{
switch ( s ) {
- case Unconfirmed: return TQString::tqfromLatin1( "unconfirmed" );
- case New: return TQString::tqfromLatin1( "new" );
- case Assigned: return TQString::tqfromLatin1( "assigned" );
- case Reopened: return TQString::tqfromLatin1( "reopened" );
- case Closed: return TQString::tqfromLatin1( "closed" );
+ case Unconfirmed: return TQString::fromLatin1( "unconfirmed" );
+ case New: return TQString::fromLatin1( "new" );
+ case Assigned: return TQString::fromLatin1( "assigned" );
+ case Reopened: return TQString::fromLatin1( "reopened" );
+ case Closed: return TQString::fromLatin1( "closed" );
default:
kdWarning() << "Bug::statusToString invalid status " << s << endl;
- return TQString::tqfromLatin1( "<invalid>" );
+ return TQString::fromLatin1( "<invalid>" );
}
}
-Bug::tqStatus Bug::stringTotqStatus( const TQString &s, bool *ok )
+Bug::Status Bug::stringToStatus( const TQString &s, bool *ok )
{
if ( ok )
*ok = true;
@@ -207,7 +207,7 @@ Bug::BugMergeList Bug::mergedWith() const
}
-Bug::tqStatus Bug::status() const
+Bug::Status Bug::status() const
{
if ( !m_impl )
return StatusUndefined;
diff --git a/kbugbuster/backend/bug.h b/kbugbuster/backend/bug.h
index e60b0e98..406179c8 100644
--- a/kbugbuster/backend/bug.h
+++ b/kbugbuster/backend/bug.h
@@ -17,7 +17,7 @@ public:
enum Severity { SeverityUndefined, Critical, Grave, Major, Crash, Normal,
Minor, Wishlist };
- enum tqStatus { StatusUndefined, Unconfirmed, New, Assigned, Reopened,
+ enum Status { StatusUndefined, Unconfirmed, New, Assigned, Reopened,
Closed };
Bug();
@@ -55,23 +55,23 @@ public:
BugMergeList mergedWith() const;
/**
- * tqStatus of a bug. Currently open or closed.
+ * Status of a bug. Currently open or closed.
* TODO: Should we add a status 'deleted' here ?
*/
- tqStatus status() const;
- void settqStatus( tqStatus newtqStatus );
+ Status status() const;
+ void setStatus( Status newStatus );
- static TQString statusLabel( tqStatus s );
+ static TQString statusLabel( Status s );
/**
Return string representation of status. This function is symmetric to
- stringTotqStatus().
+ stringToStatus().
*/
- static TQString statusToString( tqStatus s );
+ static TQString statusToString( Status s );
/**
Return status code of string representation. This function is symmetric
to statusToString().
*/
- static tqStatus stringTotqStatus( const TQString &, bool *ok = 0 );
+ static Status stringToStatus( const TQString &, bool *ok = 0 );
bool operator==( const Bug &rhs );
bool operator<( const Bug &rhs ) const;
diff --git a/kbugbuster/backend/bugcache.cpp b/kbugbuster/backend/bugcache.cpp
index 66f59eb5..ce325a31 100644
--- a/kbugbuster/backend/bugcache.cpp
+++ b/kbugbuster/backend/bugcache.cpp
@@ -137,7 +137,7 @@ Bug::List BugCache::loadBugList( const Package &pkg, const TQString &component,
if ( !title.isEmpty() ) // dunno how I ended up with an all empty bug in the cache
{
Person submitter = readPerson( m_cacheBugs, "Submitter" );
- Bug::tqStatus status = Bug::stringTotqStatus( m_cacheBugs->readEntry("Status") );
+ Bug::Status status = Bug::stringToStatus( m_cacheBugs->readEntry("Status") );
Bug::Severity severity = Bug::stringToSeverity( m_cacheBugs->readEntry("Severity") );
Person developerTODO = readPerson( m_cacheBugs, "TODO" );
Bug::BugMergeList mergedWith = m_cacheBugs->readIntListEntry( "MergedWith" );
diff --git a/kbugbuster/backend/bugcommand.h b/kbugbuster/backend/bugcommand.h
index bb53cdb4..9f68fb2e 100644
--- a/kbugbuster/backend/bugcommand.h
+++ b/kbugbuster/backend/bugcommand.h
@@ -51,7 +51,7 @@ class BugCommandClose : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("Close"); }
+ TQString type() const { return TQString::fromLatin1("Close"); }
void save( KConfig * );
@@ -68,7 +68,7 @@ class BugCommandCloseSilently : public BugCommand {
TQString name();
- TQString type() const { return TQString::tqfromLatin1("CloseSilently"); }
+ TQString type() const { return TQString::fromLatin1("CloseSilently"); }
void save( KConfig * );
};
@@ -82,7 +82,7 @@ class BugCommandReopen : public BugCommand {
TQString name();
- TQString type() const { return TQString::tqfromLatin1("Reopen"); }
+ TQString type() const { return TQString::fromLatin1("Reopen"); }
void save( KConfig * );
};
@@ -97,7 +97,7 @@ class BugCommandRetitle : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("Retitle"); }
+ TQString type() const { return TQString::fromLatin1("Retitle"); }
void save( KConfig * );
@@ -115,7 +115,7 @@ class BugCommandMerge : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("Merge"); }
+ TQString type() const { return TQString::fromLatin1("Merge"); }
void save( KConfig * );
@@ -130,7 +130,7 @@ class BugCommandUnmerge : public BugCommand {
TQString name();
- TQString type() const { return TQString::tqfromLatin1("Unmerge"); }
+ TQString type() const { return TQString::fromLatin1("Unmerge"); }
void save( KConfig * );
@@ -148,7 +148,7 @@ class BugCommandReply : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("Reply"); }
+ TQString type() const { return TQString::fromLatin1("Reply"); }
void save( KConfig * );
@@ -169,7 +169,7 @@ class BugCommandReplyPrivate : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("ReplyPrivate"); }
+ TQString type() const { return TQString::fromLatin1("ReplyPrivate"); }
void save( KConfig * );
@@ -186,7 +186,7 @@ class BugCommandSeverity : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("Severity"); }
+ TQString type() const { return TQString::fromLatin1("Severity"); }
TQString controlString() const;
@@ -204,7 +204,7 @@ class BugCommandReassign : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("Reassign"); }
+ TQString type() const { return TQString::fromLatin1("Reassign"); }
TQString controlString() const;
diff --git a/kbugbuster/backend/bugdetails.cpp b/kbugbuster/backend/bugdetails.cpp
index 6c153e2c..6b0ded58 100644
--- a/kbugbuster/backend/bugdetails.cpp
+++ b/kbugbuster/backend/bugdetails.cpp
@@ -79,7 +79,7 @@ int BugDetails::age() const
if ( !m_impl )
return 0;
- return submissionDate().daysTo( TQDateTime::tqcurrentDateTime() );
+ return submissionDate().daysTo( TQDateTime::currentDateTime() );
}
BugDetailsPart::List BugDetails::parts() const
@@ -241,7 +241,7 @@ TQValueList<BugDetails::Attachment> BugDetails::extractAttachments( const TQStri
KCodecs::base64Decode( contents.local8Bit(), a.contents /*out*/ );
else
//KCodecs::uudecode( contents.local8Bit(), a.contents /*out*/ );
- KMessageBox::information( 0, i18n("Attachment %1 could not be decoded.\nEncoding: %2").tqarg(filename).tqarg(encoding) );
+ KMessageBox::information( 0, i18n("Attachment %1 could not be decoded.\nEncoding: %2").arg(filename).arg(encoding) );
#ifdef DEBUG_EXTRACT
kdDebug() << "Result: ***\n" << TQCString( a.contents.data(), a.contents.size()+1 ) << "\n*+*" << endl;
#endif
diff --git a/kbugbuster/backend/bugdetailsjob.cpp b/kbugbuster/backend/bugdetailsjob.cpp
index 22ee31c7..1218023d 100644
--- a/kbugbuster/backend/bugdetailsjob.cpp
+++ b/kbugbuster/backend/bugdetailsjob.cpp
@@ -36,8 +36,8 @@ void BugDetailsJob::process( const TQByteArray &data )
KBB::Error err = server()->processor()->parseBugDetails( data, bugDetails );
if ( err ) {
- emit error( i18n("Bug %1: %2").tqarg( m_bug.number() )
- .tqarg( err.message() ) );
+ emit error( i18n("Bug %1: %2").arg( m_bug.number() )
+ .arg( err.message() ) );
} else {
emit bugDetailsAvailable( m_bug, bugDetails );
}
diff --git a/kbugbuster/backend/bugimpl.h b/kbugbuster/backend/bugimpl.h
index b1d94b2d..7fefc53d 100644
--- a/kbugbuster/backend/bugimpl.h
+++ b/kbugbuster/backend/bugimpl.h
@@ -12,7 +12,7 @@ struct BugImpl : public KShared
public:
BugImpl( const TQString &_title, const Person &_submitter, TQString _number,
uint _age, Bug::Severity _severity, Person _developerTODO,
- Bug::tqStatus _status, const Bug::BugMergeList& _mergedWith )
+ Bug::Status _status, const Bug::BugMergeList& _mergedWith )
: age( _age ), title( _title ), submitter( _submitter ), number( _number ),
severity( _severity ), developerTODO( _developerTODO ),
status( _status ), mergedWith( _mergedWith )
@@ -25,7 +25,7 @@ public:
TQString number;
Bug::Severity severity;
Person developerTODO;
- Bug::tqStatus status;
+ Bug::Status status;
Bug::BugMergeList mergedWith;
};
diff --git a/kbugbuster/backend/buglistjob.cpp b/kbugbuster/backend/buglistjob.cpp
index 01910ea2..419b7956 100644
--- a/kbugbuster/backend/buglistjob.cpp
+++ b/kbugbuster/backend/buglistjob.cpp
@@ -60,8 +60,8 @@ void BugListJob::process( const TQByteArray &data )
KBB::Error err = server()->processor()->parseBugList( data, bugs );
if ( err ) {
- emit error( i18n("Package %1: %2").tqarg( m_package.name() )
- .tqarg( err.message() ) );
+ emit error( i18n("Package %1: %2").arg( m_package.name() )
+ .arg( err.message() ) );
} else {
emit bugListAvailable( m_package, m_component, bugs );
}
diff --git a/kbugbuster/backend/bugmybugsjob.cpp b/kbugbuster/backend/bugmybugsjob.cpp
index 869b0827..cd8c3005 100644
--- a/kbugbuster/backend/bugmybugsjob.cpp
+++ b/kbugbuster/backend/bugmybugsjob.cpp
@@ -67,7 +67,7 @@ void BugMyBugsJob::process( const TQByteArray &data )
delete processor;
if ( err )
- emit error( i18n( "My Bugs: %2" ).tqarg( err.message() ) );
+ emit error( i18n( "My Bugs: %2" ).arg( err.message() ) );
else
emit bugListAvailable( i18n( "My Bugs" ), bugs );
}
diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp
index a1863f58..6c8aa6fb 100644
--- a/kbugbuster/backend/bugserver.cpp
+++ b/kbugbuster/backend/bugserver.cpp
@@ -152,7 +152,7 @@ KURL BugServer::attachmentEditLink( const TQString &id )
return url;
}
-Bug::tqStatus BugServer::bugtqStatus( const TQString &str )
+Bug::Status BugServer::bugStatus( const TQString &str )
{
if ( str == "UNCONFIRMED" ) {
return Bug::Unconfirmed;
@@ -318,9 +318,9 @@ TQStringList BugServer::listCommands() const
for ( ; cmdIt.current() ; ++cmdIt ) {
BugCommand* cmd = cmdIt.current();
if (!cmd->controlString().isNull())
- result.append( i18n("Control command: %1").tqarg(cmd->controlString()) );
+ result.append( i18n("Control command: %1").arg(cmd->controlString()) );
else
- result.append( i18n("Mail to %1").tqarg(cmd->mailAddress()) );
+ result.append( i18n("Mail to %1").arg(cmd->mailAddress()) );
}
}
return result;
diff --git a/kbugbuster/backend/bugserver.h b/kbugbuster/backend/bugserver.h
index b865450f..c76b565a 100644
--- a/kbugbuster/backend/bugserver.h
+++ b/kbugbuster/backend/bugserver.h
@@ -64,7 +64,7 @@ class BugServer
KURL attachmentViewLink( const TQString &id );
KURL attachmentEditLink( const TQString &id );
- Bug::tqStatus bugtqStatus( const TQString & );
+ Bug::Status bugStatus( const TQString & );
Bug::Severity bugSeverity( const TQString & );
diff --git a/kbugbuster/backend/domprocessor.cpp b/kbugbuster/backend/domprocessor.cpp
index e7b1e49c..2ce57d63 100644
--- a/kbugbuster/backend/domprocessor.cpp
+++ b/kbugbuster/backend/domprocessor.cpp
@@ -24,7 +24,7 @@
#include "domprocessor.h"
#include <tqregexp.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <kdebug.h>
#include <kmdcodec.h>
@@ -170,7 +170,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement,
TQString submitterName;
TQString submitterEmail;
TQString bugNr;
- Bug::tqStatus status = Bug::StatusUndefined;
+ Bug::Status status = Bug::StatusUndefined;
Bug::Severity severity = Bug::SeverityUndefined;
Person developerTodo;
Bug::BugMergeList mergedList;
@@ -184,7 +184,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement,
if ( e.tagName() == "bugid" )
bugNr = e.text();
else if ( e.tagName() == "status" )
- status = server()->bugtqStatus( e.text() );
+ status = server()->bugStatus( e.text() );
else if ( e.tagName() == "descr" )
title = e.text();
else if ( e.tagName() == "reporter" )
@@ -194,7 +194,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement,
else if ( e.tagName() == "severity" )
severity = Bug::stringToSeverity( e.text() );
else if ( e.tagName() == "creationdate" )
- age = ( TQDateTime::fromString( e.text(), Qt::ISODate ) ).daysTo( TQDateTime::tqcurrentDateTime() );
+ age = ( TQDateTime::fromString( e.text(), Qt::ISODate ) ).daysTo( TQDateTime::currentDateTime() );
}
Person submitter( submitterName, submitterEmail );
diff --git a/kbugbuster/backend/htmlparser.cpp b/kbugbuster/backend/htmlparser.cpp
index 4daa3d1d..15a61084 100644
--- a/kbugbuster/backend/htmlparser.cpp
+++ b/kbugbuster/backend/htmlparser.cpp
@@ -30,7 +30,7 @@
#include <tqbuffer.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
KBB::Error HtmlParser::parseBugList( const TQByteArray &data, Bug::List &bugs )
{
diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp
index 2a5ae930..93b74eff 100644
--- a/kbugbuster/backend/mailsender.cpp
+++ b/kbugbuster/backend/mailsender.cpp
@@ -39,7 +39,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
{
TQString from( fromName );
if ( !fromEmail.isEmpty() )
- from += TQString::tqfromLatin1( " <%2>" ).tqarg( fromEmail );
+ from += TQString::fromLatin1( " <%2>" ).arg( fromEmail );
kdDebug() << "MailSender::sendMail():\nFrom: " << from << "\nTo: " << to
<< "\nbccflag:" << bcc
<< "\nRecipient:" << recipient
@@ -53,18 +53,18 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
bool needHeaders = true;
- TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"),
- TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib"));
- if (!command.isNull()) command += TQString::tqfromLatin1(" -oi -t");
+ TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"),
+ TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib"));
+ if (!command.isNull()) command += TQString::fromLatin1(" -oi -t");
else {
- command = KStandardDirs::findExe(TQString::tqfromLatin1("mail"));
+ command = KStandardDirs::findExe(TQString::fromLatin1("mail"));
if (command.isNull()) return false; // give up
- command.append(TQString::tqfromLatin1(" -s "));
+ command.append(TQString::fromLatin1(" -s "));
command.append(KProcess::quote(subject));
if (bcc) {
- command.append(TQString::tqfromLatin1(" -b "));
+ command.append(TQString::fromLatin1(" -b "));
command.append(KProcess::quote(from));
}
@@ -85,11 +85,11 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
TQString textComplete;
if (needHeaders)
{
- textComplete += TQString::tqfromLatin1("From: ") + from + '\n';
- textComplete += TQString::tqfromLatin1("To: ") + to + '\n';
- if (bcc) textComplete += TQString::tqfromLatin1("Bcc: ") + from + '\n';
- textComplete += TQString::tqfromLatin1("Subject: ") + subject + '\n';
- textComplete += TQString::tqfromLatin1("X-Mailer: KBugBuster") + '\n';
+ textComplete += TQString::fromLatin1("From: ") + from + '\n';
+ textComplete += TQString::fromLatin1("To: ") + to + '\n';
+ if (bcc) textComplete += TQString::fromLatin1("Bcc: ") + from + '\n';
+ textComplete += TQString::fromLatin1("Subject: ") + subject + '\n';
+ textComplete += TQString::fromLatin1("X-Mailer: KBugBuster") + '\n';
}
textComplete += '\n'; // end of headers
textComplete += body;
@@ -121,11 +121,11 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
else
recipients << to;
- TQString message = TQString::tqfromLatin1( "From: " ) + from +
- TQString::tqfromLatin1( "\nTo: " ) + to +
- TQString::tqfromLatin1( "\nSubject: " ) + subject +
- TQString::tqfromLatin1( "\nX-Mailer: KBugBuster" ) +
- TQString::tqfromLatin1( "\n\n" ) + body;
+ TQString message = TQString::fromLatin1( "From: " ) + from +
+ TQString::fromLatin1( "\nTo: " ) + to +
+ TQString::fromLatin1( "\nSubject: " ) + subject +
+ TQString::fromLatin1( "\nX-Mailer: KBugBuster" ) +
+ TQString::fromLatin1( "\n\n" ) + body;
Smtp *smtp = new Smtp( fromEmail, recipients, message, m_smtpServer );
connect( smtp, TQT_SIGNAL( status( const TQString & ) ),
@@ -173,7 +173,7 @@ void MailSender::smtpError(const TQString &_command, const TQString &_response)
KMessageBox::error( TQT_TQWIDGET(tqApp->activeWindow()),
i18n( "Error during SMTP transfer.\n"
"command: %1\n"
- "response: %2" ).tqarg( command ).tqarg( response ) );
+ "response: %2" ).arg( command ).arg( response ) );
emit finished();
TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) );
diff --git a/kbugbuster/backend/person.cpp b/kbugbuster/backend/person.cpp
index 8f73c512..40cf72b7 100644
--- a/kbugbuster/backend/person.cpp
+++ b/kbugbuster/backend/person.cpp
@@ -53,9 +53,9 @@ Person Person::parseFromString( const TQString &_str )
}
int atPos = str.find( '@' );
- int spacedAtPos = str.find( TQString::tqfromLatin1( " at " ) );
+ int spacedAtPos = str.find( TQString::fromLatin1( " at " ) );
if ( atPos == -1 && spacedAtPos != -1 )
- str.replace( spacedAtPos, 4, TQString::tqfromLatin1( "@" ) );
+ str.replace( spacedAtPos, 4, TQString::fromLatin1( "@" ) );
int spacePos = str.find( ' ' );
while ( spacePos != -1 )
diff --git a/kbugbuster/backend/processor.cpp b/kbugbuster/backend/processor.cpp
index b6023442..c227b8cd 100644
--- a/kbugbuster/backend/processor.cpp
+++ b/kbugbuster/backend/processor.cpp
@@ -22,7 +22,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <kdebug.h>
#include <kmdcodec.h>
diff --git a/kbugbuster/backend/rdfprocessor.cpp b/kbugbuster/backend/rdfprocessor.cpp
index 3beed42f..578b330d 100644
--- a/kbugbuster/backend/rdfprocessor.cpp
+++ b/kbugbuster/backend/rdfprocessor.cpp
@@ -54,7 +54,7 @@ KBB::Error RdfProcessor::parseDomBugList( const TQDomElement &element,
TQString title;
Person submitter;
TQString bugNr;
- Bug::tqStatus status = Bug::StatusUndefined;
+ Bug::Status status = Bug::StatusUndefined;
Bug::Severity severity = Bug::SeverityUndefined;
Person developerTodo;
Bug::BugMergeList mergedList;
@@ -68,7 +68,7 @@ KBB::Error RdfProcessor::parseDomBugList( const TQDomElement &element,
if ( e.tagName() == "bz:id" ) {
bugNr = e.text();
} else if ( e.tagName() == "bz:status" ) {
- status = server()->bugtqStatus( e.text() );
+ status = server()->bugStatus( e.text() );
} else if ( e.tagName() == "bz:severity" ) {
severity = server()->bugSeverity( e.text() );
} else if ( e.tagName() == "bz:summary" ) {
diff --git a/kbugbuster/backend/smtp.cpp b/kbugbuster/backend/smtp.cpp
index df31131b..da63f926 100644
--- a/kbugbuster/backend/smtp.cpp
+++ b/kbugbuster/backend/smtp.cpp
@@ -9,7 +9,7 @@
#include "smtp.h"
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqsocket.h>
#include <tqtimer.h>
#include <kapplication.h>
@@ -37,7 +37,7 @@ Smtp::Smtp( const TQString &from, const TQStringList &to,
state = smtpInit;
command = "";
- emit status( i18n( "Connecting to %1" ).tqarg( server ) );
+ emit status( i18n( "Connecting to %1" ).arg( server ) );
mSocket->connectToHost( server, port );
t = new TQTextStream( mSocket );
@@ -79,7 +79,7 @@ void Smtp::quit()
void Smtp::connected()
{
- emit status( i18n( "Connected to %1" ).tqarg( mSocket->peerName() ) );
+ emit status( i18n( "Connected to %1" ).arg( mSocket->peerName() ) );
}
void Smtp::socketError(int errorCode)
diff --git a/kbugbuster/gui/buglvi.cpp b/kbugbuster/gui/buglvi.cpp
index f4643b8d..18d7c064 100644
--- a/kbugbuster/gui/buglvi.cpp
+++ b/kbugbuster/gui/buglvi.cpp
@@ -45,7 +45,7 @@ BugLVI::BugLVI( KListView *parent , const Bug &bug )
Person developer = bug.developerTODO();
if ( !developer.name.isEmpty() )
- setText( 3, i18n( "%1 (%2)" ).tqarg( Bug::statusLabel( bug.status() ), developer.name ) );
+ setText( 3, i18n( "%1 (%2)" ).arg( Bug::statusLabel( bug.status() ), developer.name ) );
}
BugLVI::~BugLVI()
diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp
index 9a747367..f1658aa0 100644
--- a/kbugbuster/gui/centralwidget.cpp
+++ b/kbugbuster/gui/centralwidget.cpp
@@ -17,7 +17,7 @@
#include <tqsplitter.h>
#include <tqpushbutton.h>
#include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kdialog.h>
#include <kdebug.h>
@@ -52,11 +52,11 @@ CentralWidget::CentralWidget( const TQCString &initialPackage,
const char * name )
: TQWidget( parent, name )
{
- // Master tqlayout
+ // Master layout
( new TQVBoxLayout( this, 0,
KDialog::spacingHint() ) )->setAutoAdd( true );
- // Create TQSplitter tqchildren
+ // Create TQSplitter children
m_vertSplitter = new TQSplitter( Qt::Vertical, this );
m_listPane = new CWBugListContainer( m_vertSplitter );
m_horSplitter = new TQSplitter( Qt::Horizontal,m_vertSplitter );
@@ -67,7 +67,7 @@ CentralWidget::CentralWidget( const TQCString &initialPackage,
m_searchPane->hide();
// m_listPane->hide();
- m_searchPane->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+ m_searchPane->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
TQSizePolicy::Minimum ) );
m_horSplitter->setResizeMode( m_searchPane, TQSplitter::FollowSizeHint );
diff --git a/kbugbuster/gui/cwbugdetails.cpp b/kbugbuster/gui/cwbugdetails.cpp
index f0e07cb2..134c23d7 100644
--- a/kbugbuster/gui/cwbugdetails.cpp
+++ b/kbugbuster/gui/cwbugdetails.cpp
@@ -14,7 +14,7 @@
*************************************************************************
*/
-#include <tqtextview.h>
+#include <textview.h>
#include <tqlineedit.h>
#include <tqcombobox.h>
#include <tqlabel.h>
@@ -30,8 +30,8 @@
#include <kglobal.h>
#include <krun.h>
-#include <tqlayout.h>
-#include <tqpalette.h>
+#include <layout.h>
+#include <palette.h>
using namespace KBugBusterMainWindow;
@@ -53,7 +53,7 @@ CWBugDetails::~CWBugDetails()
void CWBugDetails::setBug( const Bug &bug, const BugDetails &details )
{
- TQColorGroup cg = m_bugDesc->view()->tqpalette().active();
+ TQColorGroup cg = m_bugDesc->view()->palette().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" )
- .tqarg( cg.highlight().name() )
- .tqarg( cg.highlightedText().name() ) );
+ .arg( cg.highlight().name() )
+ .arg( cg.highlightedText().name() ) );
text.append( "<body style=\"margin: 0px\">\n" );
TQString highlightStyle = TQString( "background: %1; color: %2; " )
- .tqarg( cg.highlight().name() )
- .tqarg( cg.highlightedText().name() );
+ .arg( cg.highlight().name() )
+ .arg( cg.highlightedText().name() );
TQString borderBottomStyle = TQString( "border-bottom: solid %1 1px; " )
- .tqarg( cg.foreground().name() );
+ .arg( cg.foreground().name() );
TQString borderTopStyle = TQString( "border-top: solid %1 1px; " )
- .tqarg( cg.foreground().name() );
+ .arg( 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> " )
- .tqarg( submitter ) );
+ .arg( 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%\">" )
- .tqarg( cg.background().name() )
- .tqarg( cg.foreground().name() ) );
+ .arg( cg.background().name() )
+ .arg( 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>")
- .tqarg( sender ) );
+ .arg( sender ) );
else {
- text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + TQString("#c%1").tqarg( replies )
+ text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + TQString("#c%1").arg( replies )
+ "\">" + i18n("Reply #%1</a> from <b>%2</b>")
- .tqarg( replies ).tqarg( sender ) );
+ .arg( replies ).arg( 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>")
- .tqarg( i18n( "Attachment List") ) );
+ .arg( 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>")
- .tqarg( i18n("Description") )
- .tqarg( i18n("Date") )
- .tqarg( i18n("View") )
- .tqarg( i18n("Edit") ) );
+ .arg( i18n("Description") )
+ .arg( i18n("Date") )
+ .arg( i18n("View") )
+ .arg( i18n("Edit") ) );
TQValueList<BugDetailsImpl::AttachmentDetails>::iterator it;
for ( it = atts.begin() ; it != atts.end() ; ++it ) {
- text.append( TQString("<tr><td>%1</td>").tqarg( (*it).description ) ) ;
- text.append( TQString("<td>%1</td>").tqarg( (*it).date ) );
+ text.append( TQString("<tr><td>%1</td>").arg( (*it).description ) ) ;
+ text.append( TQString("<td>%1</td>").arg( (*it).date ) );
text.append( "<td><a href=\"" +
BugSystem::self()->server()->attachmentViewLink( (*it).id ).url() +
"\">" + i18n("View") + "</a></td>" );
diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp
index ef8fc8ef..d6b0ac83 100644
--- a/kbugbuster/gui/cwbugdetailscontainer.cpp
+++ b/kbugbuster/gui/cwbugdetailscontainer.cpp
@@ -16,7 +16,7 @@
#include <tqpushbutton.h>
#include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <kiconloader.h>
@@ -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")
- .tqarg( bug.number() )
- .tqarg( list )
- .tqarg( bug.severityAsString() )
- .tqarg( bug.title() );
+ .arg( bug.number() )
+ .arg( list )
+ .arg( bug.severityAsString() )
+ .arg( bug.title() );
}
else
{
labelText = i18n("bug #number (severity): title","Bug #%1 (%2): %3")
- .tqarg( bug.number() ).tqarg( bug.severityAsString() )
- .tqarg( bug.title() );
+ .arg( bug.number() ).arg( bug.severityAsString() )
+ .arg( 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>").tqarg( cmd->name() );
+ cmdText += TQString("<b>%1</b>").arg( 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)" )
- .tqarg( bug.number() ).tqarg( bug.title() ) );
+ .arg( bug.number() ).arg( 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." ).
- tqarg( bug.number() ).tqarg( bug.title() );
+ arg( bug.number() ).arg( bug.title() );
else
msg = i18n( "Retrieving details for bug #%1\n"
"(%2)" ).
- tqarg( bug.number() ).tqarg( bug.title() );
+ arg( bug.number() ).arg( bug.title() );
m_bugLoading->setText( msg );
m_bugStack->raiseWidget( 1 );
}
diff --git a/kbugbuster/gui/cwbugdetailscontainer_base.ui b/kbugbuster/gui/cwbugdetailscontainer_base.ui
index 338a0b7b..5f6db167 100644
--- a/kbugbuster/gui/cwbugdetailscontainer_base.ui
+++ b/kbugbuster/gui/cwbugdetailscontainer_base.ui
@@ -61,7 +61,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>20</height>
diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp
index 98124dda..778dade1 100644
--- a/kbugbuster/gui/cwbuglistcontainer.cpp
+++ b/kbugbuster/gui/cwbuglistcontainer.cpp
@@ -16,7 +16,7 @@
#include <tqpushbutton.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwidgetstack.h>
#include <kapplication.h>
@@ -143,7 +143,7 @@ void CWBugListContainer::setBugList( const TQString &label, const Bug::List &bug
}
}
- m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).tqarg( label ).tqarg( noBugs ).tqarg( noWishes ) );
+ m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).arg( label ).arg( noBugs ).arg( 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" ).tqarg( package.name() );
+ listLabel = i18n( "Product '%1', all components" ).arg( package.name() );
else
- listLabel = i18n( "Product '%1'" ).tqarg( package.name() );
+ listLabel = i18n( "Product '%1'" ).arg( package.name() );
}
else
{
- listLabel = i18n( "Product '%1', component '%2'" ).tqarg( package.name(), component );
+ listLabel = i18n( "Product '%1', component '%2'" ).arg( 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'..." ).tqarg( package.name() ) );
+ setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).arg( package.name() ) );
else
- setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).tqarg( package.name(), component ) );
+ setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).arg( 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'" ).tqarg( package.name() ) );
+ setCacheMiss( i18n( "Package '%1'" ).arg( package.name() ) );
}
void CWBugListContainer::setCacheMiss( const TQString &label )
{
- m_listLoading->setText( i18n( "%1 is not available offline." ).tqarg( label ) );
+ m_listLoading->setText( i18n( "%1 is not available offline." ).arg( label ) );
m_listStack->raiseWidget( 1 );
}
diff --git a/kbugbuster/gui/cwloadingwidget.cpp b/kbugbuster/gui/cwloadingwidget.cpp
index 6e8a9852..f2a62573 100644
--- a/kbugbuster/gui/cwloadingwidget.cpp
+++ b/kbugbuster/gui/cwloadingwidget.cpp
@@ -107,7 +107,7 @@ void CWLoadingWidget::setText( const TQString &text )
{
m_text = text;
updatePixmap();
- tqrepaint();
+ repaint();
}
void CWLoadingWidget::updatePixmap()
diff --git a/kbugbuster/gui/cwloadingwidget.h b/kbugbuster/gui/cwloadingwidget.h
index b0536b09..744c7951 100644
--- a/kbugbuster/gui/cwloadingwidget.h
+++ b/kbugbuster/gui/cwloadingwidget.h
@@ -37,7 +37,7 @@ class CWLoadingWidget : public TQFrame
public:
/**
- * Use WidgetMode to specify the tqlayout for the background images
+ * Use WidgetMode to specify the layout for the background images
* TopFrame loads and uses the logo and horizontal bars,
* BottomFrame loads the tools and the translucent block.
*/
diff --git a/kbugbuster/gui/cwsearchwidget.cpp b/kbugbuster/gui/cwsearchwidget.cpp
index 5a075bb8..79c011d7 100644
--- a/kbugbuster/gui/cwsearchwidget.cpp
+++ b/kbugbuster/gui/cwsearchwidget.cpp
@@ -18,7 +18,7 @@
#include <klocale.h>
#include <kdialog.h>
#include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kcombobox.h>
#include <tqlabel.h>
diff --git a/kbugbuster/gui/kbbbookmarkmanager.h b/kbugbuster/gui/kbbbookmarkmanager.h
index 23763300..af58a461 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::tqfromLatin1("kbugbuster/bookmarks.xml"));
+ TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("kbugbuster/bookmarks.xml"));
s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
}
return s_bookmarkManager;
diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp
index 3c57c6eb..419ba479 100644
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@@ -17,11 +17,11 @@
#include "kbbmainwindow.h"
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmultilineedit.h>
#include <tqprogressbar.h>
#include <tqpushbutton.h>
-#include <tqtextview.h>
+#include <textview.h>
#include <tqwidgetstack.h>
#include <kaction.h>
diff --git a/kbugbuster/gui/kbbmainwindow.h b/kbugbuster/gui/kbbmainwindow.h
index 71d621ec..a98edc0e 100644
--- a/kbugbuster/gui/kbbmainwindow.h
+++ b/kbugbuster/gui/kbbmainwindow.h
@@ -120,7 +120,7 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner
KToggleAction *m_disconnectedAction;
/**
- * tqStatus bar label. We need this, because the default TQt version doesn't
+ * Status 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 72212ccd..d6203c07 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" ).tqarg( pkg.name() ) );
+ setCaption( i18n( "Loading All Bugs for Product %1" ).arg( 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" ).tqarg(bug.number()) );
+ m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).arg(bug.number()) );
loadNextBug();
}
diff --git a/kbugbuster/gui/messageeditor.cpp b/kbugbuster/gui/messageeditor.cpp
index 54d56ea6..dca6bc2a 100644
--- a/kbugbuster/gui/messageeditor.cpp
+++ b/kbugbuster/gui/messageeditor.cpp
@@ -1,7 +1,7 @@
#include <tqcombobox.h>
#include <ktextedit.h>
#include <kinputdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klocale.h>
@@ -79,7 +79,7 @@ void MessageEditor::addButton()
void MessageEditor::removeButton()
{
int result = KMessageBox::warningContinueCancel(this,
- i18n("Remove the button %1?").tqarg(mSelectionCombo->currentText()),
+ i18n("Remove the button %1?").arg(mSelectionCombo->currentText()),
i18n("Remove"), KGuiItem( i18n("Delete"), "editdelete") );
if (result == KMessageBox::Continue) {
diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp
index 388a02df..11f05d4f 100644
--- a/kbugbuster/gui/msginputdialog.cpp
+++ b/kbugbuster/gui/msginputdialog.cpp
@@ -2,7 +2,7 @@
// (c) 2001, Cornelius Schumacher
#include <ktextedit.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
#include <kdebug.h>
@@ -29,7 +29,7 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug,
{
switch ( mType ) {
case Close:
- setCaption( i18n("Close Bug %1").tqarg( mBug.number() ) );
+ setCaption( i18n("Close Bug %1").arg( mBug.number() ) );
break;
case Reply:
setCaption( i18n("Reply to Bug") );
@@ -51,23 +51,23 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug,
if ( mType == Reply ) {
TQWidget *r = new TQWidget( w );
- TQHBoxLayout* rtqlayout = new TQHBoxLayout( r );
+ TQHBoxLayout* rlayout = new TQHBoxLayout( r );
TQLabel *rlabel = new TQLabel( i18n("&Recipient:"),r );
TQFont f = r->font();
f.setBold( true );
r->setFont( f );
- rtqlayout->add( rlabel );
+ rlayout->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 );
- rtqlayout->add( mRecipient );
+ rlayout->add( mRecipient );
TQSpacerItem *rspacer= new TQSpacerItem( 1,1,TQSizePolicy::Expanding );
- rtqlayout->addItem( rspacer );
+ rlayout->addItem( rspacer );
// Reply currently only replies to the bug tracking system
r->hide();
diff --git a/kbugbuster/gui/packageselectdialog.cpp b/kbugbuster/gui/packageselectdialog.cpp
index 4d3e72ac..3b84b9e9 100644
--- a/kbugbuster/gui/packageselectdialog.cpp
+++ b/kbugbuster/gui/packageselectdialog.cpp
@@ -1,5 +1,5 @@
#include <tqlistview.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqheader.h>
#include <kdebug.h>
diff --git a/kbugbuster/gui/preferencesdialog.cpp b/kbugbuster/gui/preferencesdialog.cpp
index 2c1a845c..6acb3385 100644
--- a/kbugbuster/gui/preferencesdialog.cpp
+++ b/kbugbuster/gui/preferencesdialog.cpp
@@ -2,7 +2,7 @@
#include <tqcheckbox.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlistview.h>
@@ -79,15 +79,15 @@ void PreferencesDialog::setupServerPage()
TQFrame *topFrame = addPage( i18n("Servers"), 0,
DesktopIcon( "gohome", KIcon::SizeMedium ) );
- TQBoxLayout *tqlayout = new TQVBoxLayout( topFrame );
- tqlayout->setSpacing( spacingHint() );
+ TQBoxLayout *layout = new TQVBoxLayout( topFrame );
+ layout->setSpacing( spacingHint() );
mServerList = new ServerListView( topFrame );
- tqlayout->addWidget( mServerList );
+ layout->addWidget( mServerList );
TQHBox *buttonBox = new TQHBox( topFrame );
buttonBox->setSpacing( spacingHint() );
- tqlayout->addWidget( buttonBox );
+ layout->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 );
- tqlayout->addWidget( button );
+ layout->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 *tqlayout = new TQVBoxLayout( topFrame );
- tqlayout->setSpacing( spacingHint() );
+ TQBoxLayout *layout = new TQVBoxLayout( topFrame );
+ layout->setSpacing( spacingHint() );
TQButtonGroup *mailGroup = new TQButtonGroup( 1,Qt::Horizontal,
i18n( "Mail Client" ), topFrame );
- tqlayout->addWidget( mailGroup );
+ layout->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 );
- tqlayout->addWidget( mShowClosedCheckBox );
+ layout->addWidget( mShowClosedCheckBox );
mShowWishesCheckBox = new TQCheckBox( i18n( "Show wishes" ), topFrame );
- tqlayout->addWidget( mShowWishesCheckBox );
+ layout->addWidget( mShowWishesCheckBox );
mShowVotedCheckBox = new TQCheckBox( i18n( "Show bugs with number of votes greater than:" ), topFrame );
- tqlayout->addWidget( mShowVotedCheckBox );
+ layout->addWidget( mShowVotedCheckBox );
mMinVotesInput = new KIntNumInput( topFrame );
mMinVotesInput->setMinValue( 0 );
connect( mShowVotedCheckBox, TQT_SIGNAL(toggled(bool)),
mMinVotesInput, TQT_SLOT(setEnabled(bool)) );
- tqlayout->addWidget( mMinVotesInput );
+ layout->addWidget( mMinVotesInput );
mSendBccCheckBox = new TQCheckBox( i18n( "Send BCC to myself" ), topFrame );
- tqlayout->addWidget( mSendBccCheckBox );
+ layout->addWidget( mSendBccCheckBox );
}
void PreferencesDialog::setDefaults()
diff --git a/kbugbuster/gui/serverconfigdialog.cpp b/kbugbuster/gui/serverconfigdialog.cpp
index feaab83d..8cf91f5d 100644
--- a/kbugbuster/gui/serverconfigdialog.cpp
+++ b/kbugbuster/gui/serverconfigdialog.cpp
@@ -6,7 +6,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqlabel.h>
#include <tqvbox.h>
diff --git a/kbugbuster/gui/severityselectdialog.cpp b/kbugbuster/gui/severityselectdialog.cpp
index bef2640b..66eac388 100644
--- a/kbugbuster/gui/severityselectdialog.cpp
+++ b/kbugbuster/gui/severityselectdialog.cpp
@@ -1,4 +1,4 @@
-#include <tqlayout.h>
+#include <layout.h>
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
diff --git a/kbugbuster/kresources/kcalresource.cpp b/kbugbuster/kresources/kcalresource.cpp
index dd858f18..5af8b8be 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.tqarg( bug.number() ) ) );
+ newTodo->addAttachment( new KCal::Attachment( uri.arg( bug.number() ) ) );
todo = newTodo;
}
diff --git a/kbugbuster/kresources/kcalresourceconfig.cpp b/kbugbuster/kresources/kcalresourceconfig.cpp
index 58466642..2b4a7457 100644
--- a/kbugbuster/kresources/kcalresourceconfig.cpp
+++ b/kbugbuster/kresources/kcalresourceconfig.cpp
@@ -22,7 +22,7 @@
#include <typeinfo>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klineedit.h>
#include <klocale.h>