summaryrefslogtreecommitdiffstats
path: root/kresources
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:59:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:59:01 -0600
commit716a5de8870d7c02bb4d0aed72f30291b17b763a (patch)
tree29e58b213ead28151ccf7eb33d12c968ea844120 /kresources
parent0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 (diff)
downloadtdepim-716a5de8870d7c02bb4d0aed72f30291b17b763a.tar.gz
tdepim-716a5de8870d7c02bb4d0aed72f30291b17b763a.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'kresources')
-rw-r--r--kresources/birthdays/resourcekabc.cpp6
-rw-r--r--kresources/blogging/xmlrpcjob.cpp4
-rw-r--r--kresources/caldav/job.cpp6
-rw-r--r--kresources/caldav/resource.cpp28
-rw-r--r--kresources/carddav/job.cpp2
-rw-r--r--kresources/carddav/resource.cpp16
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpc.cpp8
-rw-r--r--kresources/egroupware/todostatemapper.cpp2
-rw-r--r--kresources/egroupware/xmlrpciface.cpp2
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise.cpp4
-rw-r--r--kresources/groupwise/kioslave/groupwise.cpp4
-rw-r--r--kresources/groupwise/soap/contactconverter.cpp2
-rw-r--r--kresources/groupwise/soap/groupwiseserver.cpp4
-rw-r--r--kresources/groupwise/soap/gwjobs.cpp4
-rw-r--r--kresources/groupwise/soap/incidenceconverter.cpp4
-rw-r--r--kresources/groupwise/soap/ksslsocket.cpp4
-rw-r--r--kresources/groupwise/soap/soapC.cpp2
-rw-r--r--kresources/groupwise/soap/soapStub.h2
-rw-r--r--kresources/groupwise/soap/stdsoap2.h4
-rw-r--r--kresources/kolab/kabc/contact.cpp12
-rw-r--r--kresources/kolab/kabc/contact.h4
-rw-r--r--kresources/kolab/kcal/incidence.cpp2
-rw-r--r--kresources/kolab/kcal/resourcekolab.cpp14
-rw-r--r--kresources/kolab/kcal/task.cpp16
-rw-r--r--kresources/kolab/kcal/task.h2
-rw-r--r--kresources/kolab/knotes/note.cpp2
-rw-r--r--kresources/kolab/shared/resourcekolabbase.cpp6
-rw-r--r--kresources/lib/folderlister.cpp4
-rw-r--r--kresources/remote/resourceremote.cpp2
-rw-r--r--kresources/scalix/kabc/contact.cpp20
-rw-r--r--kresources/scalix/kcal/resourcescalix.cpp2
-rw-r--r--kresources/scalix/kioslave/scalix.cpp14
-rw-r--r--kresources/scalix/scalixadmin/jobs.cpp10
-rw-r--r--kresources/scalix/scalixadmin/ldapview.cpp4
-rw-r--r--kresources/scalix/scalixadmin/passwordpage.cpp2
-rw-r--r--kresources/scalix/scalixadmin/settings.cpp4
-rw-r--r--kresources/scalix/shared/resourcescalixbase.cpp2
-rw-r--r--kresources/slox/kcalresourceslox.cpp8
38 files changed, 119 insertions, 119 deletions
diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp
index fde979ed..7102c8be 100644
--- a/kresources/birthdays/resourcekabc.cpp
+++ b/kresources/birthdays/resourcekabc.cpp
@@ -169,7 +169,7 @@ bool ResourceKABC::doLoad()
email_1 = (*it).fullEmail();
uid_1 = (*it).uid();
if (name_1.isEmpty()) name_1 = (*it).realName();
- summary = i18n("%1's birthday").tqarg( name_1 );
+ summary = i18n("%1's birthday").arg( name_1 );
Event *ev = new Event();
@@ -276,10 +276,10 @@ bool ResourceKABC::doLoad()
name_2 = spouse.realName();
}
summary = i18n("insert names of both spouses",
- "%1's & %2's anniversary").tqarg( name_1 ).tqarg( name_2 );
+ "%1's & %2's anniversary").arg( name_1 ).arg( name_2 );
} else {
summary = i18n("only one spouse in addressbook, insert the name",
- "%1's anniversary").tqarg( name_1 );
+ "%1's anniversary").arg( name_1 );
}
Event *ev = new Event();
diff --git a/kresources/blogging/xmlrpcjob.cpp b/kresources/blogging/xmlrpcjob.cpp
index ae2b1b80..19582ec3 100644
--- a/kresources/blogging/xmlrpcjob.cpp
+++ b/kresources/blogging/xmlrpcjob.cpp
@@ -171,14 +171,14 @@ kdDebug() << m_str_response << endl;
// TODO: Set the error of the job
m_response.clear();
m_response << TQVariant( i18n( "Unknown type of XML markup received. "
- "Markup: \n %1" ).tqarg( m_str_response ) );
+ "Markup: \n %1" ).arg( m_str_response ) );
m_responseType = XMLRPCUnknownResponse;
}
} else {
// TODO: if we can't parse the XML response, set the correct error message!
// emit fault( -1, i18n( "Received invalid XML markup: %1 at %2:%3" )
-// .tqarg( errMsg ).tqarg( errLine ).tqarg( errCol ), m_id );
+// .arg( errMsg ).arg( errLine ).arg( errCol ), m_id );
}
TransferJob::slotFinished();
diff --git a/kresources/caldav/job.cpp b/kresources/caldav/job.cpp
index c79ef06a..8e49041f 100644
--- a/kresources/caldav/job.cpp
+++ b/kresources/caldav/job.cpp
@@ -82,7 +82,7 @@ void CalDavJob::processError(const caldav_error* err) {
if (-401 == code) { // unauthorized
error_string = i18n("Unauthorized. Username or password incorrect.");
} else if (-599 <= code && code <= -300) {
- error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code);
+ error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code);
} else {
error_string = err->str;
}
@@ -98,7 +98,7 @@ void CalDavJob::processTasksError(const caldav_error* err) {
if (-401 == code) { // unauthorized
error_string = i18n("Unauthorized. Username or password incorrect.");
} else if (-599 <= code && code <= -300) {
- error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code);
+ error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code);
} else {
error_string = err->str;
}
@@ -114,7 +114,7 @@ void CalDavJob::processJournalsError(const caldav_error* err) {
if (-401 == code) { // unauthorized
error_string = i18n("Unauthorized. Username or password incorrect.");
} else if (-599 <= code && code <= -300) {
- error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code);
+ error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code);
} else {
error_string = err->str;
}
diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index fc5bc75e..daf7ebde 100644
--- a/kresources/caldav/resource.cpp
+++ b/kresources/caldav/resource.cpp
@@ -147,7 +147,7 @@ bool ResourceCalDav::doLoad() {
return true; // Silently fail; the user has obviously not responded to a dialog and we don't need to pop up more of them!
}
- log(TQString("doLoad(%1)").tqarg(syncCache));
+ log(TQString("doLoad(%1)").arg(syncCache));
clearCache();
@@ -168,7 +168,7 @@ bool ResourceCalDav::doLoad() {
bool ResourceCalDav::doSave() {
bool syncCache = true;
- log(TQString("doSave(%1)").tqarg(syncCache));
+ log(TQString("doSave(%1)").arg(syncCache));
if (!hasChanges()) {
log("no changes");
@@ -378,7 +378,7 @@ void ResourceCalDav::loadFinished() {
TQCString newpass;
if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
log("load error: " + loader->errorString() );
- loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+ loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
else {
// Set new password and try again
@@ -388,12 +388,12 @@ void ResourceCalDav::loadFinished() {
}
else {
log("load error: " + loader->errorString() );
- loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+ loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
}
else {
log("load error: " + loader->errorString() );
- loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+ loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
} else {
log("successful event load");
@@ -426,7 +426,7 @@ void ResourceCalDav::loadFinished() {
// TQCString newpass;
// if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
// log("load error: " + loader->tasksErrorString() );
-// loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
+// loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
// }
// else {
// // Set new password and try again
@@ -436,12 +436,12 @@ void ResourceCalDav::loadFinished() {
}
else {
log("load error: " + loader->tasksErrorString() );
- loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
+ loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
}
}
else {
log("load error: " + loader->tasksErrorString() );
- loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
+ loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
}
} else {
log("successful tasks load");
@@ -474,7 +474,7 @@ void ResourceCalDav::loadFinished() {
// TQCString newpass;
// if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
// log("load error: " + loader->journalsErrorString() );
-// loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
+// loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
// }
// else {
// // Set new password and try again
@@ -484,12 +484,12 @@ void ResourceCalDav::loadFinished() {
}
else {
log("load error: " + loader->journalsErrorString() );
- loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
+ loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
}
}
else {
log("load error: " + loader->journalsErrorString() );
- loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
+ loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
}
} else {
log("successful journals load");
@@ -971,7 +971,7 @@ void ResourceCalDav::writingFinished() {
TQCString newpass;
if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
log("write error: " + mWriter->errorString());
- saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
else {
// Set new password and try again
@@ -981,12 +981,12 @@ void ResourceCalDav::writingFinished() {
}
else {
log("write error: " + mWriter->errorString());
- saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
}
else {
log("write error: " + mWriter->errorString());
- saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
} else {
log("success");
diff --git a/kresources/carddav/job.cpp b/kresources/carddav/job.cpp
index a842b00a..994964af 100644
--- a/kresources/carddav/job.cpp
+++ b/kresources/carddav/job.cpp
@@ -69,7 +69,7 @@ void CardDavJob::processError(const carddav_error* err) {
if (-401 == code) { // unauthorized
error_string = i18n("Unauthorized. Username or password incorrect.");
} else if (-599 <= code && code <= -300) {
- error_string = i18n("HTTP error %1. Maybe, URL is not a CardDAV resource.").tqarg(-code);
+ error_string = i18n("HTTP error %1. Maybe, URL is not a CardDAV resource.").arg(-code);
} else {
error_string = err->str;
}
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index 2648ca7a..a708eef0 100644
--- a/kresources/carddav/resource.cpp
+++ b/kresources/carddav/resource.cpp
@@ -144,7 +144,7 @@ bool ResourceCardDav::load() {
return true; // Silently fail; the user has obviously not responded to a dialog and we don't need to pop up more of them!
}
- log(TQString("doLoad(%1)").tqarg(syncCache));
+ log(TQString("doLoad(%1)").arg(syncCache));
// FIXME KABC
//clearCache();
@@ -166,7 +166,7 @@ bool ResourceCardDav::load() {
bool ResourceCardDav::doSave() {
bool syncCache = true;
- log(TQString("doSave(%1)").tqarg(syncCache));
+ log(TQString("doSave(%1)").arg(syncCache));
if (!hasChanges()) {
log("no changes");
@@ -372,7 +372,7 @@ void ResourceCardDav::loadFinished() {
TQCString newpass;
if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
log("load error: " + loader->errorString() );
- addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+ addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
else {
// Set new password and try again
@@ -382,12 +382,12 @@ void ResourceCardDav::loadFinished() {
}
else {
log("load error: " + loader->errorString() );
- addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+ addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
}
else {
log("load error: " + loader->errorString() );
- addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+ addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
} else {
log("successful load");
@@ -641,7 +641,7 @@ void ResourceCardDav::writingFinished() {
TQCString newpass;
if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
log("write error: " + mWriter->errorString());
- addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
else {
// Set new password and try again
@@ -651,12 +651,12 @@ void ResourceCardDav::writingFinished() {
}
else {
log("write error: " + mWriter->errorString());
- addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
}
else {
log("write error: " + mWriter->errorString());
- addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
} else {
log("success");
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp
index 1247975f..222c4f4f 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp
@@ -393,7 +393,7 @@ void ResourceXMLRPC::deleteContactFinished( const TQValueList<TQVariant>&,
void ResourceXMLRPC::fault( int error, const TQString &errorMsg,
const TQVariant& )
{
- TQString msg = i18n( "<qt>Server sent error %1: <b>%2</b></qt>" ).tqarg( error ).tqarg( errorMsg );
+ TQString msg = i18n( "<qt>Server sent error %1: <b>%2</b></qt>" ).arg( error ).arg( errorMsg );
if ( addressBook() )
addressBook()->error( msg );
@@ -408,7 +408,7 @@ void ResourceXMLRPC::addContactFault( int, const TQString &errorMsg,
mAddrMap.remove( addr.uid() );
TQString msg = i18n( "Unable to add contact %1 to server. (%2)" );
- addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) );
+ addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) );
}
void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg,
@@ -417,7 +417,7 @@ void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg,
KABC::Addressee addr = mAddrMap[ id.toString() ];
TQString msg = i18n( "Unable to update contact %1 on server. (%2)" );
- addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) );
+ addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) );
}
void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg,
@@ -437,7 +437,7 @@ void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg,
mAddrMap.insert( addr.uid(), addr );
TQString msg = i18n( "Unable to delete contact %1 from server. (%2)" );
- addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) );
+ addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) );
}
TQString ResourceXMLRPC::addrTypesToTypeStr( int typeMask )
diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp
index 81c517d0..531b298f 100644
--- a/kresources/egroupware/todostatemapper.cpp
+++ b/kresources/egroupware/todostatemapper.cpp
@@ -153,7 +153,7 @@ TQString TodoStateMapper::toRemote( int localState )
else if ( localState == 100 )
return "done";
else
- return TQString( "%1%" ).tqarg( localState );
+ return TQString( "%1%" ).arg( localState );
}
TQString TodoStateMapper::filename()
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index 09176ae6..fd12d174 100644
--- a/kresources/egroupware/xmlrpciface.cpp
+++ b/kresources/egroupware/xmlrpciface.cpp
@@ -113,7 +113,7 @@ void Query::slotResult( KIO::Job *job )
if ( !doc.setContent( data, false, &errMsg, &errLine, &errCol ) )
{
emit fault( -1, i18n( "Received invalid XML markup: %1 at %2:%3" )
- .tqarg( errMsg ).tqarg( errLine ).tqarg( errCol ), m_id );
+ .arg( errMsg ).arg( errLine ).arg( errCol ), m_id );
emit finished( this );
return ;
}
diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp
index 8526f1fe..d14d1a41 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise.cpp
@@ -287,7 +287,7 @@ bool ResourceGroupwise::asyncLoad()
if ( !mProgress )
{
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
- KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).tqarg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) );
+ KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) );
connect( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
TQT_SLOT( cancelLoad() ) );
}
@@ -708,7 +708,7 @@ KURL ResourceGroupwise::createAccessUrl( BookType bookType, AccessMode mode, uns
if ( mode == Update && lastSequenceNumber > 0 && lastPORebuildTime > 0 )
{
- query += TQString::fromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).tqarg( lastSequenceNumber ).tqarg( lastPORebuildTime );;
+ query += TQString::fromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).arg( lastSequenceNumber ).arg( lastPORebuildTime );;
}
url.setQuery( query );
return url;
diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp
index 7e9324b2..e257ba71 100644
--- a/kresources/groupwise/kioslave/groupwise.cpp
+++ b/kresources/groupwise/kioslave/groupwise.cpp
@@ -117,7 +117,7 @@ void Groupwise::get( const KURL &url )
getAddressbook( url );
} else {
TQString error = i18n("Unknown path. Known paths are '/freebusy/', "
- "'/calendar/' and '/addressbook/'.") + TQString(" path was %1" ).tqarg( url.url() );
+ "'/calendar/' and '/addressbook/'.") + TQString(" path was %1" ).arg( url.url() );
errorMessage( error );
}
@@ -419,7 +419,7 @@ void Groupwise::slotReadAddressBookProcessedSize( int size )
void Groupwise::slotServerErrorMessage( const TQString & serverErrorMessage, bool fatal )
{
kdDebug() << "Groupwise::slotJobErrorMessage()" << serverErrorMessage << ( fatal ? ", FATAL!" : ", proceeding" ) << endl;
- errorMessage( i18n( "An error occurred while communicating with the GroupWise server:\n%1" ).tqarg( serverErrorMessage ) );
+ errorMessage( i18n( "An error occurred while communicating with the GroupWise server:\n%1" ).arg( serverErrorMessage ) );
}
#include "groupwise.moc"
diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp
index 34c934fe..69c4b90f 100644
--- a/kresources/groupwise/soap/contactconverter.cpp
+++ b/kresources/groupwise/soap/contactconverter.cpp
@@ -402,7 +402,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
// TODO: map protocol to KDE's set of known protocol names (need to know the set of services in use elsewhere)
if ( protocol == "nov" )
protocol = "groupwise";
- addr.insertCustom( TQString::fromLatin1("messaging/%1").tqarg( protocol ),
+ addr.insertCustom( TQString::fromLatin1("messaging/%1").arg( protocol ),
TQString::fromLatin1( "All" ),
addresses.join( TQChar( 0xE000 ) ) );
}
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index 2b4f9827..130895cd 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -132,7 +132,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
errorMessage = TQString::fromLatin1( strerror( errno ) );
perror( 0 );
soap->error = SOAP_TCP_ERROR;
- mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage );
+ mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
return SOAP_INVALID_SOCKET;
}
@@ -149,7 +149,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
if ( rc == -3 )
errorMessage = TQString::fromLatin1( "Connection timed out. Check host and port number" );
}
- mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage );
+ mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
soap->error =SOAP_TCP_ERROR;
return SOAP_INVALID_SOCKET;
}
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index 24c0c0dc..47aa6774 100644
--- a/kresources/groupwise/soap/gwjobs.cpp
+++ b/kresources/groupwise/soap/gwjobs.cpp
@@ -121,7 +121,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
&itemsRequest, &itemsResponse );
if ( result != 0 ) {
soap_print_fault( mSoap, stderr );
- mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: %1" ).tqarg( id.c_str() ), false );
+ mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: %1" ).arg( id.c_str() ), false );
return;
}
@@ -613,7 +613,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
else
{
kdDebug() << " readCursor got no Items in Response!" << endl;
- mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: reading %1 returned no items." ).tqarg( id.c_str() ), false );
+ mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: reading %1 returned no items." ).arg( id.c_str() ), false );
break;
}
}
diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp
index 7610e811..8d21e4da 100644
--- a/kresources/groupwise/soap/incidenceconverter.cpp
+++ b/kresources/groupwise/soap/incidenceconverter.cpp
@@ -470,7 +470,7 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence,
KCal::Attendee::List::ConstIterator it;
for( it = attendees.begin(); it != attendees.end(); ++it ) {
if ( !to.isEmpty() )
- to += TQString::fromLatin1( "; %1" ).tqarg( (*it)->name() );
+ to += TQString::fromLatin1( "; %1" ).arg( (*it)->name() );
kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName()
<< endl;
TQString uuid;
@@ -635,7 +635,7 @@ void IncidenceConverter::getAttendees( ngwt__CalendarItem *item, KCal::Incidence
// set our status
if ( emailsMatch( stringToTQString(recipient->email), mFromEmail ) )
if ( item->status->accepted )
- attendee->seStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction );
+ attendee->setStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction );
else
kdDebug() << "---- found ourselves, but not accepted" << endl;
else
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index 8119e3e7..e38f00d0 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -325,7 +325,7 @@ int KSSLSocket::verifyCertificate()
"does not match the one the "
"certificate was issued to.");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
- msg.tqarg(ourHost),
+ msg.arg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
KStdGuiItem::cont().text() );
@@ -335,7 +335,7 @@ int KSSLSocket::verifyCertificate()
TQString msg = i18n("The server certificate failed the "
"authenticity test (%1).");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
- msg.tqarg(ourHost),
+ msg.arg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
KStdGuiItem::cont().text() );
diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp
index 658040e4..13f91309 100644
--- a/kresources/groupwise/soap/soapC.cpp
+++ b/kresources/groupwise/soap/soapC.cpp
@@ -11148,7 +11148,7 @@ static const struct soap_code_map soap_codes_ngwt__VersionEventType[] =
{ (long)created, "created" },
{ (long)deleteVersion, "deleteVersion" },
{ (long)endAccess, "endAccess" },
- { (long)reseStatus, "reseStatus" },
+ { (long)resetStatus, "resetStatus" },
{ (long)restore, "restore" },
{ (long)retrieve, "retrieve" },
{ (long)securityModified, "securityModified" },
diff --git a/kresources/groupwise/soap/soapStub.h b/kresources/groupwise/soap/soapStub.h
index 7fdb0f68..f41b9f7a 100644
--- a/kresources/groupwise/soap/soapStub.h
+++ b/kresources/groupwise/soap/soapStub.h
@@ -241,7 +241,7 @@ enum ngwt__StatusTrackingOptions {None = 0, Delivered = 1, DeliveredAndOpened =
#ifndef SOAP_TYPE_ngwt__VersionEventType
#define SOAP_TYPE_ngwt__VersionEventType (384)
/* ngwt:VersionEventType */
-enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, reseStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15};
+enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, resetStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15};
#endif
#ifndef SOAP_TYPE_ngwt__VersionStatus
diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h
index 7dee722a..4ff4725a 100644
--- a/kresources/groupwise/soap/stdsoap2.h
+++ b/kresources/groupwise/soap/stdsoap2.h
@@ -1350,8 +1350,8 @@ struct soap
std::ostream *os;
std::istream *is;
#else
- void *os; /* preserve tqalignment */
- void *is; /* preserve tqalignment */
+ void *os; /* preserve alignment */
+ void *is; /* preserve alignment */
#endif
#ifndef UNDER_CE
int sendfd;
diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index 3bb0054e..79609902 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -293,12 +293,12 @@ TQDate Contact::anniversary() const
return mAnniversary;
}
-void Contact::setChildren( const TQString& tqchildren )
+void Contact::setChildren( const TQString& children )
{
- mChildren = tqchildren;
+ mChildren = children;
}
-TQString Contact::tqchildren() const
+TQString Contact::children() const
{
return mChildren;
}
@@ -619,7 +619,7 @@ bool Contact::loadAttribute( TQDomElement& element )
}
break;
case 'c':
- if ( tagName == "tqchildren" ) {
+ if ( tagName == "children" ) {
setChildren( element.text() );
return true;
}
@@ -798,7 +798,7 @@ bool Contact::saveAttributes( TQDomElement& element ) const
writeString( element, "x-logo", mLogoAttachmentName );
if ( !sound().isNull() )
writeString( element, "x-sound", mSoundAttachmentName );
- writeString( element, "tqchildren", tqchildren() );
+ writeString( element, "children", children() );
writeString( element, "gender", gender() );
writeString( element, "language", language() );
savePhoneAttributes( element );
@@ -1146,7 +1146,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
// mailer, timezone, productId, sortString, agent, rfc2426 name()
// Things KAddressBook can't handle, so they are saved as unhandled tags:
- // initials, tqchildren, gender, language
+ // initials, children, gender, language
}
// The loading is: xml -> Contact -> addressee, this is the second part
diff --git a/kresources/kolab/kabc/contact.h b/kresources/kolab/kabc/contact.h
index 60c39933..6e0de80b 100644
--- a/kresources/kolab/kabc/contact.h
+++ b/kresources/kolab/kabc/contact.h
@@ -154,8 +154,8 @@ public:
TQString soundAttachmentName() const { return mSoundAttachmentName; }
TQByteArray sound() const { return mSound; }
- void setChildren( const TQString& tqchildren );
- TQString tqchildren() const;
+ void setChildren( const TQString& children );
+ TQString children() const;
void setGender( const TQString& gender );
TQString gender() const;
diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp
index 9155ad43..2617da4a 100644
--- a/kresources/kolab/kcal/incidence.cpp
+++ b/kresources/kolab/kcal/incidence.cpp
@@ -1030,7 +1030,7 @@ void Incidence::loadAttachments()
TQString Incidence::productID() const
{
- return TQString( "KOrganizer %1, Kolab resource" ).tqarg( korgVersion );
+ return TQString( "KOrganizer %1, Kolab resource" ).arg( korgVersion );
}
// Unhandled KCal::Incidence fields:
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index 8fa16eea..edd94303 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -423,7 +423,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre
addedIncidence = inc;
} else if ( result == 0 ) { // take both
addedIncidence = inc;
- addedIncidence->setSummary( i18n("Copy of: %1").tqarg( addedIncidence->summary() ) );
+ addedIncidence->setSummary( i18n("Copy of: %1").arg( addedIncidence->summary() ) );
addedIncidence->setUid( CalFormat::createUniqueId() );
localIncidence = local;
}
@@ -604,24 +604,24 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
}
text += "<font></b><br>";
if ( !incidence->summary().isEmpty() )
- text += i18n( "<b>Summary:</b> %1" ).tqarg( incidence->summary() ) + "<br>";
+ text += i18n( "<b>Summary:</b> %1" ).arg( incidence->summary() ) + "<br>";
if ( !incidence->location().isEmpty() )
- text += i18n( "<b>Location:</b> %1" ).tqarg( incidence->location() );
+ text += i18n( "<b>Location:</b> %1" ).arg( incidence->location() );
text += "<br>";
if ( !incidence->doesFloat() )
text += i18n( "<b>Start:</b> %1, %2" )
- .tqarg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() );
+ .arg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() );
else
- text += i18n( "<b>Start:</b> %1" ).tqarg( incidence->dtStartDateStr() );
+ text += i18n( "<b>Start:</b> %1" ).arg( incidence->dtStartDateStr() );
text += "<br>";
if ( incidence->type() == "Event" ) {
Event* event = static_cast<Event*>( incidence );
if ( event->hasEndDate() ) {
if ( !event->doesFloat() ) {
text += i18n( "<b>End:</b> %1, %2" )
- .tqarg( event->dtEndDateStr(), event->dtEndTimeStr() );
+ .arg( event->dtEndDateStr(), event->dtEndTimeStr() );
} else {
- text += i18n( "<b>End:</b> %1" ).tqarg( event->dtEndDateStr() );
+ text += i18n( "<b>End:</b> %1" ).arg( event->dtEndDateStr() );
}
}
text += "<br>";
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 488daf4a..ccbb03e5 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -126,7 +126,7 @@ int Task::percentCompleted() const
return mPercentCompleted;
}
-void Task::seStatus( KCal::Incidence::Status status )
+void Task::setStatus( KCal::Incidence::Status status )
{
mStatus = status;
}
@@ -234,17 +234,17 @@ bool Task::loadAttribute( TQDomElement& element )
setPercentCompleted( percent );
} else if ( tagName == "status" ) {
if ( element.text() == "in-progress" )
- seStatus( KCal::Incidence::StatusInProcess );
+ setStatus( KCal::Incidence::StatusInProcess );
else if ( element.text() == "completed" )
- seStatus( KCal::Incidence::StatusCompleted );
+ setStatus( KCal::Incidence::StatusCompleted );
else if ( element.text() == "waiting-on-someone-else" )
- seStatus( KCal::Incidence::StatusNeedsAction );
+ setStatus( KCal::Incidence::StatusNeedsAction );
else if ( element.text() == "deferred" )
// Guessing a status here
- seStatus( KCal::Incidence::StatusCanceled );
+ setStatus( KCal::Incidence::StatusCanceled );
else
// Default
- seStatus( KCal::Incidence::StatusNone );
+ setStatus( KCal::Incidence::StatusNone );
} else if ( tagName == "due-date" ) {
setDueDate( element.text() );
} else if ( tagName == "parent" ) {
@@ -374,7 +374,7 @@ void Task::setFields( const KCal::Todo* task )
setPriority( task->priority() );
setPercentCompleted( task->percentComplete() );
- seStatus( task->status() );
+ setStatus( task->status() );
setHasStartDate( task->hasStartDate() );
if ( task->hasDueDate() ) {
@@ -447,7 +447,7 @@ void Task::saveTo( KCal::Todo* task )
task->setPriority( priority() );
task->setPercentComplete( percentCompleted() );
- task->seStatus( status() );
+ task->setStatus( status() );
task->setHasStartDate( hasStartDate() );
task->setHasDueDate( hasDueDate() );
if ( hasDueDate() )
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index 981c56ab..38a12a70 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -77,7 +77,7 @@ public:
virtual void setPercentCompleted( int percent );
virtual int percentCompleted() const;
- virtual void seStatus( KCal::Incidence::Status status );
+ virtual void setStatus( KCal::Incidence::Status status );
virtual KCal::Incidence::Status status() const;
virtual void setParent( const TQString& parentUid );
diff --git a/kresources/kolab/knotes/note.cpp b/kresources/kolab/knotes/note.cpp
index ea5f6b28..e456e43b 100644
--- a/kresources/kolab/knotes/note.cpp
+++ b/kresources/kolab/knotes/note.cpp
@@ -225,5 +225,5 @@ void Note::saveTo( KCal::Journal* journal )
TQString Note::productID() const
{
- return TQString( "KNotes %1, Kolab resource" ).tqarg( KNOTES_VERSION );
+ return TQString( "KNotes %1, Kolab resource" ).arg( KNOTES_VERSION );
}
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index 1599acaa..d88c2125 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -126,8 +126,8 @@ static TQString plainTextBody()
" Groupware format.\nFor a list of such email clients please"
" visit\n%1" );
const char * url = "http://www.kolab.org/kolab2-clients.html";
- TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).tqarg( url );
- TQString firstPartText = i18n( firstPartTextToTranslate ).tqarg( url );
+ TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).arg( url );
+ TQString firstPartText = i18n( firstPartTextToTranslate ).arg( url );
if ( firstPartText != firstPartTextUntranslated ) {
firstPartText.append("\n\n-----------------------------------------------------\n\n");
firstPartText.append( firstPartTextUntranslated );
@@ -190,7 +190,7 @@ bool ResourceKolabBase::kmailUpdate( const TQString& resource,
TQString ResourceKolabBase::configFile( const TQString& type ) const
{
return locateLocal( "config",
- TQString( "kresources/kolab/%1rc" ).tqarg( type ) );
+ TQString( "kresources/kolab/%1rc" ).arg( type ) );
}
bool ResourceKolabBase::connectToKMail() const
diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp
index eec969c2..affc6af5 100644
--- a/kresources/lib/folderlister.cpp
+++ b/kresources/lib/folderlister.cpp
@@ -137,7 +137,7 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs )
for ( int i=0; i<nr; ++i ) {
TQStringList l( newprefs->folder( i ) );
-// TQStringList l( cfgg.readListEntry( TQString("Folder%1").tqarg( i ) ) );
+// TQStringList l( cfgg.readListEntry( TQString("Folder%1").arg( i ) ) );
Entry e;
if ( l.count()>0 ) {
e.id = l.first();
@@ -186,7 +186,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs )
lst << (*it).name;
lst += contentTypeToStrings( (*it).type );
newprefs->setFolder( nr, lst );
-// cfgg.writeEntry( TQString("Folder%1").tqarg( nr ), lst );
+// cfgg.writeEntry( TQString("Folder%1").arg( nr ), lst );
if ( (*it).active ) active.append( (*it).id );
nr++;
}
diff --git a/kresources/remote/resourceremote.cpp b/kresources/remote/resourceremote.cpp
index 18b8782e..229dd86b 100644
--- a/kresources/remote/resourceremote.cpp
+++ b/kresources/remote/resourceremote.cpp
@@ -330,7 +330,7 @@ void ResourceRemote::dump() const
void ResourceRemote::addInfoText( TQString &txt ) const
{
txt += "<br>";
- txt += i18n("URL: %1").tqarg( mDownloadUrl.prettyURL() );
+ txt += i18n("URL: %1").arg( mDownloadUrl.prettyURL() );
}
bool ResourceRemote::setValue( const TQString &key, const TQString &value )
diff --git a/kresources/scalix/kabc/contact.cpp b/kresources/scalix/kabc/contact.cpp
index 762d4b9f..9f38674e 100644
--- a/kresources/scalix/kabc/contact.cpp
+++ b/kresources/scalix/kabc/contact.cpp
@@ -103,19 +103,19 @@ TQString Contact::toXml( const KABC::Addressee &addr )
comment = addr.formattedName();
display = emails[ i ];
} else {
- comment = custom( TQString( "email%1_address_with_comment" ).tqarg( i + 1 ), addr );
- display = custom( TQString( "email%1_display_name" ).tqarg( i + 1 ), addr );
+ comment = custom( TQString( "email%1_address_with_comment" ).arg( i + 1 ), addr );
+ display = custom( TQString( "email%1_display_name" ).arg( i + 1 ), addr );
}
}
- xml += TQString( "<email%1_address_type>" ).tqarg( i + 1 ) + type +
- TQString( "</email%1_address_type>" ).tqarg( i + 1 ) +"\n";
- xml += TQString( "<email%1_address>" ).tqarg( i + 1 ) + address +
- TQString( "</email%1_address>" ).tqarg( i + 1 ) +"\n";
- xml += TQString( "<email%1_address_with_comment>" ).tqarg( i + 1 ) + comment +
- TQString( "</email%1_address_with_comment>" ).tqarg( i + 1 ) + "\n";
- xml += TQString( "<email%1_display_name>" ).tqarg( i + 1 ) + display +
- TQString( "</email%1_display_name>" ).tqarg( i + 1 ) + "\n";
+ xml += TQString( "<email%1_address_type>" ).arg( i + 1 ) + type +
+ TQString( "</email%1_address_type>" ).arg( i + 1 ) +"\n";
+ xml += TQString( "<email%1_address>" ).arg( i + 1 ) + address +
+ TQString( "</email%1_address>" ).arg( i + 1 ) +"\n";
+ xml += TQString( "<email%1_address_with_comment>" ).arg( i + 1 ) + comment +
+ TQString( "</email%1_address_with_comment>" ).arg( i + 1 ) + "\n";
+ xml += TQString( "<email%1_display_name>" ).arg( i + 1 ) + display +
+ TQString( "</email%1_display_name>" ).arg( i + 1 ) + "\n";
}
KABC::PhoneNumber phone = addr.phoneNumber( KABC::PhoneNumber::Home );
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index 21f05f04..eeebb32f 100644
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@@ -325,7 +325,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr
} else if ( result == 0 ) { // take both
localIncidence = local->clone();
localIncidence->recreate();
- localIncidence->setSummary( i18n("Copy of: %1").tqarg(localIncidence->summary()) );
+ localIncidence->setSummary( i18n("Copy of: %1").arg(localIncidence->summary()) );
addedIncidence = inc;
}
bool silent = mSilent;
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index acfa088e..c5631f78 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -104,14 +104,14 @@ void Scalix::retrieveFreeBusy( const KURL &url )
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
- const TQString argument = TQString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).tqarg( requestUser );
- const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).tqarg( argument.length() );
+ const TQString argument = TQString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).arg( requestUser );
+ const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).arg( argument.length() );
stream << (int) 'X' << 'E' << command << argument;
- TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ?
+ TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
url.user() : url.user() + ":" + url.pass() )
- .tqarg( url.host() );
+ .arg( url.host() );
mFreeBusyData = TQString();
@@ -173,13 +173,13 @@ void Scalix::publishFreeBusy( const KURL &url )
TQDataStream stream( packedArgs, IO_WriteOnly );
const TQString argument = TQString::fromUtf8( data );
- const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).tqarg( argument.length() );
+ const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).arg( argument.length() );
stream << (int) 'X' << 'E' << command << argument;
- TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ?
+ TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
url.user() : url.user() + ":" + url.pass() )
- .tqarg( url.host() );
+ .arg( url.host() );
KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false );
connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
diff --git a/kresources/scalix/scalixadmin/jobs.cpp b/kresources/scalix/scalixadmin/jobs.cpp
index 2d682391..f1bce9f2 100644
--- a/kresources/scalix/scalixadmin/jobs.cpp
+++ b/kresources/scalix/scalixadmin/jobs.cpp
@@ -73,7 +73,7 @@ SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url,
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'X' << (int)'N'
- << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).tqarg( oldPassword ).tqarg( newPassword );
+ << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).arg( oldPassword ).arg( newPassword );
SetPasswordJob* job = new SetPasswordJob( url, packedArgs, false );
KIO::Scheduler::assignJobToSlave( slave, job );
@@ -95,7 +95,7 @@ SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const T
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'X' << (int)'N'
- << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).tqarg( email ).tqarg( types.join( " " ) );
+ << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).arg( email ).arg( types.join( " " ) );
SetDelegateJob* job = new SetDelegateJob( url, packedArgs, false );
KIO::Scheduler::assignJobToSlave( slave, job );
@@ -164,9 +164,9 @@ GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url )
SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg )
{
const TQString argument = msg;
- const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).tqarg( enabled ? "ENABLED" : "DISABLED" )
- .tqarg( "UTF-8" )
- .tqarg( msg.utf8().length() );
+ const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).arg( enabled ? "ENABLED" : "DISABLED" )
+ .arg( "UTF-8" )
+ .arg( msg.utf8().length() );
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
diff --git a/kresources/scalix/scalixadmin/ldapview.cpp b/kresources/scalix/scalixadmin/ldapview.cpp
index b52c0aad..adf2fe3f 100644
--- a/kresources/scalix/scalixadmin/ldapview.cpp
+++ b/kresources/scalix/scalixadmin/ldapview.cpp
@@ -85,8 +85,8 @@ void LdapView::setQuery( const TQString &query )
void LdapView::entryAdded( const KABC::LdapObject &obj )
{
- const TQString text = TQString( "%1 (%2)" ).tqarg( TQString(obj.attrs[ "surname" ].first()) )
- .tqarg( TQString(obj.attrs[ "mail" ].first()) );
+ const TQString text = TQString( "%1 (%2)" ).arg( TQString(obj.attrs[ "surname" ].first()) )
+ .arg( TQString(obj.attrs[ "mail" ].first()) );
new LdapItem( this, text, obj.attrs[ "mail" ].first() );
}
diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp
index 51b11f6f..e75d3fdd 100644
--- a/kresources/scalix/scalixadmin/passwordpage.cpp
+++ b/kresources/scalix/scalixadmin/passwordpage.cpp
@@ -179,7 +179,7 @@ void PasswordPage::finished( KIO::Job* job )
group.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
}
- KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).tqarg( group.readNumEntry( "Folder" ) ) );
+ KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) );
fileGroup.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
}
}
diff --git a/kresources/scalix/scalixadmin/settings.cpp b/kresources/scalix/scalixadmin/settings.cpp
index d5c5cdb1..52f72296 100644
--- a/kresources/scalix/scalixadmin/settings.cpp
+++ b/kresources/scalix/scalixadmin/settings.cpp
@@ -92,8 +92,8 @@ TQString Settings::rulesWizardUrl() const
TQString url = group.readEntry( "rulesWizardUrl" );
if ( url.isEmpty() ) {
KConfigGroup group( &config, "Account" );
- url = TQString( "http://%1/Scalix/rw/?username=%2" ).tqarg( group.readEntry( "host" ) )
- .tqarg( group.readEntry( "user" ) );
+ url = TQString( "http://%1/Scalix/rw/?username=%2" ).arg( group.readEntry( "host" ) )
+ .arg( group.readEntry( "user" ) );
}
return url;
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index c9bfca35..c9c7ee11 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -130,7 +130,7 @@ bool ResourceScalixBase::kmailUpdate( const TQString& resource,
TQString ResourceScalixBase::configFile( const TQString& type ) const
{
return locateLocal( "config",
- TQString( "kresources/scalix/%1rc" ).tqarg( type ) );
+ TQString( "kresources/scalix/%1rc" ).arg( type ) );
}
bool ResourceScalixBase::connectToKMail() const
diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp
index 39e3be39..0b712b66 100644
--- a/kresources/slox/kcalresourceslox.cpp
+++ b/kresources/slox/kcalresourceslox.cpp
@@ -177,7 +177,7 @@ bool KCalResourceSlox::doLoad()
TQString p = KURL( mPrefs->url() ).protocol();
if ( p != "http" && p != "https" && p != "webdav" && p != "webdavs" ) {
- TQString err = i18n("Non-http protocol: '%1'").tqarg( p );
+ TQString err = i18n("Non-http protocol: '%1'").arg( p );
kdDebug() << "KCalResourceSlox::load(): " << err << endl;
loadError( err );
return false;
@@ -629,11 +629,11 @@ void KCalResourceSlox::parseMembersAttribute( const TQDomElement &e,
TQString status = memberElement.attribute( "confirm" );
if ( !status.isEmpty() ) {
if ( status == "accept" ) {
- a->seStatus( Attendee::Accepted );
+ a->setStatus( Attendee::Accepted );
} else if ( status == "decline" ) {
- a->seStatus( Attendee::Declined );
+ a->setStatus( Attendee::Declined );
} else {
- a->seStatus( Attendee::NeedsAction );
+ a->setStatus( Attendee::NeedsAction );
}
}
} else {