summaryrefslogtreecommitdiffstats
path: root/kresources
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
commit1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch)
treef2defe163a805a9e34a2142dfde4cdb5e49241e7 /kresources
parent67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff)
downloadtdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz
tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kresources')
-rw-r--r--kresources/birthdays/resourcekabc.cpp22
-rw-r--r--kresources/blogging/xmlrpcjob.cpp4
-rw-r--r--kresources/caldav/configwidgets.cpp4
-rw-r--r--kresources/caldav/job.cpp6
-rw-r--r--kresources/caldav/resource.cpp32
-rw-r--r--kresources/carddav/configwidgets.cpp4
-rw-r--r--kresources/carddav/job.cpp2
-rw-r--r--kresources/carddav/resource.cpp18
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpc.cpp8
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpc.cpp2
-rw-r--r--kresources/egroupware/todostatemapper.cpp2
-rw-r--r--kresources/egroupware/xmlrpciface.cpp8
-rw-r--r--kresources/exchange/dateset.cpp4
-rw-r--r--kresources/exchange/resourceexchange.cpp2
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise.cpp4
-rw-r--r--kresources/groupwise/kabc_resourcegroupwiseconfig.cpp2
-rw-r--r--kresources/groupwise/kcal_resourcegroupwiseconfig.cpp2
-rw-r--r--kresources/groupwise/kioslave/groupwise.cpp4
-rw-r--r--kresources/groupwise/soap/contactconverter.cpp6
-rw-r--r--kresources/groupwise/soap/groupwiseserver.cpp8
-rw-r--r--kresources/groupwise/soap/gwconverter.cpp12
-rw-r--r--kresources/groupwise/soap/gwjobs.cpp6
-rw-r--r--kresources/groupwise/soap/incidenceconverter.cpp10
-rw-r--r--kresources/groupwise/soap/ksslsocket.cpp4
-rw-r--r--kresources/kolab/kcal/incidence.cpp2
-rw-r--r--kresources/kolab/kcal/resourcekolab.cpp16
-rw-r--r--kresources/kolab/knotes/note.cpp2
-rw-r--r--kresources/kolab/shared/kolabbase.cpp10
-rw-r--r--kresources/kolab/shared/resourcekolabbase.cpp6
-rw-r--r--kresources/lib/folderconfig.cpp2
-rw-r--r--kresources/lib/folderlister.cpp4
-rw-r--r--kresources/lib/folderlistview.cpp4
-rw-r--r--kresources/lib/kcal_resourcegroupwarebase.cpp2
-rw-r--r--kresources/lib/webdavhandler.cpp2
-rw-r--r--kresources/newexchange/exchangeconvertercalendar.cpp12
-rw-r--r--kresources/remote/resourceremote.cpp2
-rw-r--r--kresources/scalix/kabc/contact.cpp28
-rw-r--r--kresources/scalix/kcal/resourcescalix.cpp2
-rw-r--r--kresources/scalix/kioslave/scalix.cpp16
-rw-r--r--kresources/scalix/scalixadmin/jobs.cpp10
-rw-r--r--kresources/scalix/scalixadmin/ldapview.cpp4
-rw-r--r--kresources/scalix/scalixadmin/outofofficepage.cpp2
-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/scalix/shared/scalixbase.cpp8
-rw-r--r--kresources/slox/kabcresourceslox.cpp4
-rw-r--r--kresources/slox/kcalresourceslox.cpp2
-rw-r--r--kresources/slox/webdavhandler.cpp4
49 files changed, 164 insertions, 164 deletions
diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp
index 815df5ca9..f3be66d83 100644
--- a/kresources/birthdays/resourcekabc.cpp
+++ b/kresources/birthdays/resourcekabc.cpp
@@ -163,13 +163,13 @@ bool ResourceKABC::doLoad()
TQDate birthdate = (*it).birthday().date();
TQString name_1, email_1, uid_1;
if ( birthdate.isValid() ) {
- kdDebug(5800) << "found a birthday " << birthdate.toString() << endl;
+ kdDebug(5800) << "found a birthday " << TQString(birthdate.toString()) << endl;
name_1 = (*it).nickName();
email_1 = (*it).fullEmail();
uid_1 = (*it).uid();
if (name_1.isEmpty()) name_1 = (*it).realName();
- summary = i18n("%1's birthday").arg( name_1 );
+ summary = i18n("%1's birthday").tqarg( name_1 );
Event *ev = new Event();
@@ -214,13 +214,13 @@ bool ResourceKABC::doLoad()
ev->setReadOnly( true );
mCalendar.addEvent(ev);
- kdDebug(5800) << "imported " << birthdate.toString() << endl;
+ kdDebug(5800) << "imported " << TQString(birthdate.toString()) << endl;
}
TQString anniversary_string = (*it).custom( "KADDRESSBOOK", "X-Anniversary" );
if (anniversary_string.isEmpty() )
continue;
- TQDateTime anniversary = TQDate::fromString( anniversary_string, TQt::ISODate );
+ TQDateTime anniversary = TQDate::fromString( anniversary_string, Qt::ISODate );
if ( !anniversary.isValid() )
continue;
@@ -232,8 +232,8 @@ bool ResourceKABC::doLoad()
for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
if ( name == (*addrIt).realName() ) {
TQDate spouseAnniversary =
- TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
- if ( anniversary == spouseAnniversary ) {
+ TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+ if ( anniversary == TQDateTime(spouseAnniversary) ) {
found = true;
break;
@@ -247,8 +247,8 @@ bool ResourceKABC::doLoad()
}
for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
- TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
- kdDebug(5800) << "found a anniversary " << anniversary.toString() << endl;
+ TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+ kdDebug(5800) << "found a anniversary " << TQString(anniversary.toString()) << endl;
TQString name;
TQString name_1 = (*addrIt).nickName();
TQString uid_1 = (*addrIt).uid();
@@ -276,10 +276,10 @@ bool ResourceKABC::doLoad()
name_2 = spouse.realName();
}
summary = i18n("insert names of both spouses",
- "%1's & %2's anniversary").arg( name_1 ).arg( name_2 );
+ "%1's & %2's anniversary").tqarg( name_1 ).tqarg( name_2 );
} else {
summary = i18n("only one spouse in addressbook, insert the name",
- "%1's anniversary").arg( name_1 );
+ "%1's anniversary").tqarg( name_1 );
}
Event *ev = new Event();
@@ -328,7 +328,7 @@ bool ResourceKABC::doLoad()
ev->setReadOnly( true );
mCalendar.addEvent(ev);
- kdDebug(5800) << "imported " << anniversary.toString() << endl;
+ kdDebug(5800) << "imported " << TQString(anniversary.toString()) << endl;
}
return true;
diff --git a/kresources/blogging/xmlrpcjob.cpp b/kresources/blogging/xmlrpcjob.cpp
index e2a3adc32..f20dff875 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" ).arg( m_str_response ) );
+ "Markup: \n %1" ).tqarg( 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" )
-// .arg( errMsg ).arg( errLine ).arg( errCol ), m_id );
+// .tqarg( errMsg ).tqarg( errLine ).tqarg( errCol ), m_id );
}
TransferJob::slotFinished();
diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp
index e986c3380..e84eb2eb2 100644
--- a/kresources/caldav/configwidgets.cpp
+++ b/kresources/caldav/configwidgets.cpp
@@ -113,7 +113,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *tqparent )
d->mIntervalSpin->setRange( 1, 900 );
d->mIntervalSpin->setEnabled( false );
- groupBox->setColumnLayout(1, TQt::Vertical);
+ groupBox->setColumnLayout(1, Qt::Vertical);
TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
vbox->addWidget(intervalRadio);
vbox->addWidget(intervalBox);
@@ -206,7 +206,7 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *tqparent )
intervalRadio->hide();
intervalBox->hide();
- groupBox->setColumnLayout(1, TQt::Vertical);
+ groupBox->setColumnLayout(1, Qt::Vertical);
TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
vbox->addWidget(delay);
vbox->addWidget(every);
diff --git a/kresources/caldav/job.cpp b/kresources/caldav/job.cpp
index f32864f63..a7a4af54a 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.").arg(-code);
+ error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-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.").arg(-code);
+ error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-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.").arg(-code);
+ error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code);
} else {
error_string = err->str;
}
diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index 7d7e2a484..d828037bf 100644
--- a/kresources/caldav/resource.cpp
+++ b/kresources/caldav/resource.cpp
@@ -105,7 +105,7 @@ ResourceCalDav::~ResourceCalDav() {
while ((mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady) {
readLockout = true;
sleep(1);
- tqApp->processEvents(TQEventLoop::ExcludeUserInput);
+ tqApp->tqprocessEvents(TQEventLoop::ExcludeUserInput);
}
if (mWriter) {
@@ -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)").arg(syncCache));
+ log(TQString("doLoad(%1)").tqarg(syncCache));
clearCache();
@@ -168,7 +168,7 @@ bool ResourceCalDav::doLoad() {
bool ResourceCalDav::doSave() {
bool syncCache = true;
- log(TQString("doSave(%1)").arg(syncCache));
+ log(TQString("doSave(%1)").tqarg(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] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ loadError(TQString("[%1] ").tqarg(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] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
}
}
else {
log("load error: " + loader->errorString() );
- loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ loadError(TQString("[%1] ").tqarg(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] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
+// loadError(TQString("[%1] ").tqarg(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] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
+ loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
}
}
else {
log("load error: " + loader->tasksErrorString() );
- loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
+ loadError(TQString("[%1] ").tqarg(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] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
+// loadError(TQString("[%1] ").tqarg(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] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
+ loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
}
}
else {
log("load error: " + loader->journalsErrorString() );
- loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
+ loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
}
} else {
log("successful journals load");
@@ -741,7 +741,7 @@ TQString ResourceCalDav::getICalString(const Incidence::List& inc) {
// Remove any line feeds/carriage returns/white spaces from the UID field as they WILL break libcaldav
int uidPos = data.tqfind("UID:", 0) + 4;
- int nextPos = data.findRev("\n", data.tqfind(":", uidPos));
+ int nextPos = data.tqfindRev("\n", data.tqfind(":", uidPos));
TQString uidField = data.mid(uidPos, nextPos-uidPos);
data.remove(uidPos, nextPos-uidPos);
uidField.tqreplace("\n", "");
@@ -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] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ saveError(TQString("[%1] ").tqarg(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] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
}
else {
log("write error: " + mWriter->errorString());
- saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
} else {
log("success");
diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp
index 84d97938d..fbc19c7e3 100644
--- a/kresources/carddav/configwidgets.cpp
+++ b/kresources/carddav/configwidgets.cpp
@@ -112,7 +112,7 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *tqparent )
d->mIntervalSpin->setRange( 1, 900 );
d->mIntervalSpin->setEnabled( false );
- groupBox->setColumnLayout(1, TQt::Vertical);
+ groupBox->setColumnLayout(1, Qt::Vertical);
TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
vbox->addWidget(intervalRadio);
vbox->addWidget(intervalBox);
@@ -205,7 +205,7 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *tqparent )
intervalRadio->hide();
intervalBox->hide();
- groupBox->setColumnLayout(1, TQt::Vertical);
+ groupBox->setColumnLayout(1, Qt::Vertical);
TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
vbox->addWidget(delay);
vbox->addWidget(every);
diff --git a/kresources/carddav/job.cpp b/kresources/carddav/job.cpp
index d2795d68b..4d3fd3d43 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.").arg(-code);
+ error_string = i18n("HTTP error %1. Maybe, URL is not a CardDAV resource.").tqarg(-code);
} else {
error_string = err->str;
}
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index 5cd95c3f5..9570d2b3c 100644
--- a/kresources/carddav/resource.cpp
+++ b/kresources/carddav/resource.cpp
@@ -105,7 +105,7 @@ ResourceCardDav::~ResourceCardDav() {
while ((mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady) {
readLockout = true;
sleep(1);
- tqApp->processEvents(TQEventLoop::ExcludeUserInput);
+ tqApp->tqprocessEvents(TQEventLoop::ExcludeUserInput);
}
if (mWriter) {
@@ -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)").arg(syncCache));
+ log(TQString("doLoad(%1)").tqarg(syncCache));
// FIXME KABC
//clearCache();
@@ -166,7 +166,7 @@ bool ResourceCardDav::load() {
bool ResourceCardDav::doSave() {
bool syncCache = true;
- log(TQString("doSave(%1)").arg(syncCache));
+ log(TQString("doSave(%1)").tqarg(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] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ addressBook()->error(TQString("[%1] ").tqarg(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] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
}
}
else {
log("load error: " + loader->errorString() );
- addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ addressBook()->error(TQString("[%1] ").tqarg(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] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ addressBook()->error(TQString("[%1] ").tqarg(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] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
}
else {
log("write error: " + mWriter->errorString());
- addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
} else {
log("success");
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp
index ae789ef62..2e5053240 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>" ).arg( error ).arg( errorMsg );
+ TQString msg = i18n( "<qt>Server sent error %1: <b>%2</b></qt>" ).tqarg( error ).tqarg( 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.arg( addr.formattedName(), errorMsg ) );
+ addressBook()->error( msg.tqarg( 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.arg( addr.formattedName(), errorMsg ) );
+ addressBook()->error( msg.tqarg( 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.arg( addr.formattedName(), errorMsg ) );
+ addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) );
}
TQString ResourceXMLRPC::addrTypesToTypeStr( int typeMask )
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index 6bbdc2342..b15a5a395 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@@ -946,7 +946,7 @@ void ResourceXMLRPC::writeEvent( Event *event, TQMap<TQString, TQVariant> &args
// handle all day events
if ( event->doesFloat() )
- args.insert( "end", event->dtEnd().addDays( 1 ) );
+ args.insert( "end", TQDateTime(event->dtEnd().addDays( 1 )) );
else
args.insert( "end", event->dtEnd() );
diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp
index 0793bd609..2539d23aa 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%" ).arg( localState );
+ return TQString( "%1%" ).tqarg( localState );
}
TQString TodoStateMapper::filename()
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index bd31a194a..4a46a37eb 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" )
- .arg( errMsg ).arg( errLine ).arg( errCol ), m_id );
+ .tqarg( errMsg ).tqarg( errLine ).tqarg( errCol ), m_id );
emit finished( this );
return ;
}
@@ -222,7 +222,7 @@ TQString Query::marshal( const TQVariant &arg ) const
case TQVariant::ByteArray:
return "<value><base64>" + KCodecs::base64Encode( arg.toByteArray() ) + "</base64></value>\r\n";
case TQVariant::DateTime:
- return "<value><datetime.iso8601>" + arg.toDateTime().toString( TQt::ISODate ) + "</datetime.iso8601></value>\r\n";
+ return "<value><datetime.iso8601>" + arg.toDateTime().toString( Qt::ISODate ) + "</datetime.iso8601></value>\r\n";
case TQVariant::List:
{
TQString markup = "<value><array><data>\r\n";
@@ -277,9 +277,9 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const
return TQVariant( false );
}
else if ( typeName == "base64" )
- return TQVariant( KCodecs::base64Decode( typeElement.text().latin1() ) );
+ return TQVariant( KCodecs::base64Decode( TQCString(typeElement.text().latin1()) ) );
else if ( typeName == "datetime" || typeName == "datetime.iso8601" )
- return TQVariant( TQDateTime::fromString( typeElement.text(), TQt::ISODate ) );
+ return TQVariant( TQDateTime::fromString( typeElement.text(), Qt::ISODate ) );
else if ( typeName == "array" )
{
TQValueList<TQVariant> values;
diff --git a/kresources/exchange/dateset.cpp b/kresources/exchange/dateset.cpp
index d28409a9c..e6393afa0 100644
--- a/kresources/exchange/dateset.cpp
+++ b/kresources/exchange/dateset.cpp
@@ -232,9 +232,9 @@ void DateSet::print()
TQDate start = mDates->at( i )->first;
TQDate end = mDates->at( i )->second;
if (start == end)
- kdDebug() << start.toString() << endl;
+ kdDebug() << TQString(start.toString()) << endl;
else
- kdDebug() << "(" << start.toString() << " , " << end.toString() << ")" << endl;
+ kdDebug() << "(" << TQString(start.toString()) << " , " << TQString(end.toString()) << ")" << endl;
}
}
diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp
index 234907fcb..de9158755 100644
--- a/kresources/exchange/resourceexchange.cpp
+++ b/kresources/exchange/resourceexchange.cpp
@@ -495,7 +495,7 @@ Event::List ResourceExchange::rawEventsForDate( const TQDate &qd,
// FIXME: This is needed for the hack below:
Event::List eventsBefore = mCache->rawEvents();
- kdDebug() << "Reading events for month of " << start.toString() << endl;
+ kdDebug() << "Reading events for month of " << TQString(start.toString()) << endl;
mClient->downloadSynchronous( mCache, start, end, true ); // Show progress dialog
// FIXME: This is a terrible hack! We need to install the observer for
diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp
index d1300f9c9..6ac8a880a 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" ).arg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) );
+ KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).tqarg( 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::tqfromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).arg( lastSequenceNumber ).arg( lastPORebuildTime );;
+ query += TQString::tqfromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).tqarg( lastSequenceNumber ).tqarg( lastPORebuildTime );;
}
url.setQuery( query );
return url;
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
index 91b0380a9..a5ccb74fc 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
@@ -202,7 +202,7 @@ void ResourceGroupwiseConfig::updateAddressBookView()
mWriteAddressBookIds.append( (*abIt).id );
}
- int index = mWriteAddressBookIds.findIndex( mResource->prefs()->writeAddressBook() );
+ int index = mWriteAddressBookIds.tqfindIndex( mResource->prefs()->writeAddressBook() );
mAddressBookBox->setCurrentItem( index );
}
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
index 8e579f8cd..e02cf2c52 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
@@ -123,7 +123,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings()
if ( s )
{
- KDialogBase * dialog = new KDialogBase( ::qt_cast<TQWidget*>(tqparent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
+ KDialogBase * dialog = new KDialogBase( ::tqqt_cast<TQWidget*>(tqparent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
// TQVBoxLayout * tqlayout = new TQVBoxLayout( dialog );
GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog );
dialog->setMainWidget( settingsWidget );
diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp
index c535e5689..8689309b4 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" ).arg( url.url() );
+ "'/calendar/' and '/addressbook/'.") + TQString(" path was %1" ).tqarg( 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" ).arg( serverErrorMessage ) );
+ errorMessage( i18n( "An error occurred while communicating with the GroupWise server:\n%1" ).tqarg( serverErrorMessage ) );
}
#include "groupwise.moc"
diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp
index 97aff84f2..605d14d69 100644
--- a/kresources/groupwise/soap/contactconverter.cpp
+++ b/kresources/groupwise/soap/contactconverter.cpp
@@ -70,7 +70,7 @@ ngwt__Contact* ContactConverter::convertToContact( const KABC::Addressee &addr )
std::vector<ngwt__ContainerRef*>* container = soap_new_std__vectorTemplateOfPointerTongwt__ContainerRef( soap(), -1 );
ngwt__ContainerRef* containerRef = soap_new_ngwt__ContainerRef( soap(), -1 );
containerRef->deleted = 0;
- containerRef->__item = addr.custom( "GWRESOURCE", "CONTAINER" ).utf8();
+ containerRef->__item = addr.custom( "GWRESOURCE", "CONTAINER" ).utf8().data();
container->push_back( containerRef );
contact->container = *container;
@@ -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::tqfromLatin1("messaging/%1").arg( protocol ),
+ addr.insertCustom( TQString::tqfromLatin1("messaging/%1").tqarg( protocol ),
TQString::tqfromLatin1( "All" ),
addresses.join( TQChar( 0xE000 ) ) );
}
@@ -456,7 +456,7 @@ ngwt__PhoneNumber* ContactConverter::convertPhoneNumber( const KABC::PhoneNumber
return 0;
ngwt__PhoneNumber* phoneNumber = soap_new_ngwt__PhoneNumber( soap(), -1 );
- phoneNumber->__item = number.number().utf8();
+ phoneNumber->__item = number.number().utf8().data();
if ( number.type() & KABC::PhoneNumber::Fax ) {
phoneNumber->type = Fax;
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index bd908c442..3aee84877 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::tqfromLatin1( strerror( errno ) );
perror( 0 );
soap->error = SOAP_TCP_ERROR;
- mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
+ mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage );
return SOAP_INVALID_SOCKET;
}
@@ -149,7 +149,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
if ( rc == -3 )
errorMessage = TQString::tqfromLatin1( "Connection timed out. Check host and port number" );
}
- mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
+ mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage );
soap->error =SOAP_TCP_ERROR;
return SOAP_INVALID_SOCKET;
}
@@ -315,7 +315,7 @@ bool GroupwiseServer::login()
ngwt__PlainText pt;
- pt.username = mUser.utf8();
+ pt.username = mUser.utf8().data();
pt.password = conv.qStringToString( mPassword );
loginReq.auth = &pt;
mSoap->userid = strdup( mUser.utf8() );
@@ -1370,7 +1370,7 @@ bool GroupwiseServer::readFreeBusy( const TQString &email,
// Get free/busy data
_ngwm__getFreeBusyRequest getFreeBusyRequest;
- getFreeBusyRequest.freeBusySessionId = TQString::number( fbSessionId ).utf8();
+ getFreeBusyRequest.freeBusySessionId = TQString::number( fbSessionId ).utf8().data();
_ngwm__getFreeBusyResponse getFreeBusyResponse;
diff --git a/kresources/groupwise/soap/gwconverter.cpp b/kresources/groupwise/soap/gwconverter.cpp
index 5ca7c332f..3cd61f60b 100644
--- a/kresources/groupwise/soap/gwconverter.cpp
+++ b/kresources/groupwise/soap/gwconverter.cpp
@@ -67,8 +67,8 @@ char* GWConverter::qStringToChar( const TQString &string )
TQDate GWConverter::charToTQDate( const char *str )
{
- if ( !str ) return TQDate(); // FIXME: TQt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd
- return TQDate::fromString( TQString::fromUtf8( str ), TQt::ISODate );
+ if ( !str ) return TQDate(); // FIXME: Qt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd
+ return TQDate::fromString( TQString::fromUtf8( str ), Qt::ISODate );
}
char *GWConverter::qDateTimeToChar( const TQDateTime &dt,
@@ -94,7 +94,7 @@ std::string* GWConverter::qDateTimeToString( const TQDateTime &dt )
TQDateTime GWConverter::stringToTQDateTime( const std::string* str )
{
- TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), TQt::ISODate );
+ TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), Qt::ISODate );
return dt;
}
@@ -111,15 +111,15 @@ std::string* GWConverter::qDateToString( const TQDate &date )
TQDate GWConverter::stringToTQDate( std::string* str )
{
//NB this ISODate may become unnecessary, if GW stops sending in yyyy-mm-dd format again
- return TQDate::fromString( TQString::tqfromLatin1( str->c_str() ), TQt::ISODate );
+ return TQDate::fromString( TQString::tqfromLatin1( str->c_str() ), Qt::ISODate );
}
TQDateTime GWConverter::charToTQDateTime( const char *str )
{
if ( !str ) return TQDateTime();
// kdDebug() << "charToTQDateTime(): " << str << endl;
- // as above re TQt::ISODate
- TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), TQt::ISODate );
+ // as above re Qt::ISODate
+ TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), Qt::ISODate );
// kdDebug() << " " << dt.toString() << endl;
return dt;
}
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index bd2f908e4..7a95cf6e8 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" ).arg( id.c_str() ), false );
+ mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: %1" ).tqarg( id.c_str() ), false );
return;
}
@@ -192,7 +192,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
cursorRequest.container = id;
cursorRequest.view = 0;
- if ( id.tqfind( "GroupWiseSystemAddressBook" ) == 0 )
+ if ( id.find( "GroupWiseSystemAddressBook" ) == 0 )
{
kdDebug() << " Book: " << id.c_str() << " is a SAB " << endl;
// filter for Contacts until we support Groups
@@ -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." ).arg( id.c_str() ), false );
+ mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: reading %1 returned no items." ).tqarg( id.c_str() ), false );
break;
}
}
diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp
index b7a360ee3..7888ff50a 100644
--- a/kresources/groupwise/soap/incidenceconverter.cpp
+++ b/kresources/groupwise/soap/incidenceconverter.cpp
@@ -370,7 +370,7 @@ bool IncidenceConverter::convertToCalendarItem( KCal::Incidence* incidence, ngwt
std::vector<ngwt__ContainerRef*>* container = soap_new_std__vectorTemplateOfPointerTongwt__ContainerRef( soap(), -1 );
ngwt__ContainerRef* containerRef = soap_new_ngwt__ContainerRef( soap(), -1 );
containerRef->deleted = 0;
- containerRef->__item = incidence->customProperty( "GWRESOURCE", "CONTAINER" ).utf8();
+ containerRef->__item = incidence->customProperty( "GWRESOURCE", "CONTAINER" ).utf8().data();
container->push_back( containerRef );
item->container = *container;
@@ -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::tqfromLatin1( "; %1" ).arg( (*it)->name() );
+ to += TQString::tqfromLatin1( "; %1" ).tqarg( (*it)->name() );
kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName()
<< endl;
TQString uuid;
@@ -543,7 +543,7 @@ bool IncidenceConverter::convertFromCalendarItem( ngwt__CalendarItem* item,
std::vector<xsd__date>::const_iterator it;
for ( it = dateList->begin(); it != dateList->end(); ++it ) {
- TQDate date = TQDate::fromString( s2q( *it ), TQt::ISODate );
+ TQDate date = TQDate::fromString( s2q( *it ), Qt::ISODate );
if ( date.isValid() )
}
}
@@ -689,7 +689,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen
// recurrence date - try setting it using the recurrence start date - didn't help
/* std::string startDate;
- startDate.append( recur->recurStart().date().toString( TQt::ISODate ).utf8() );
+ startDate.append( recur->recurStart().date().toString( Qt::ISODate ).utf8() );
item->rdate = soap_new_ngwt__RecurrenceDateType( soap(), -1 );
item->rdate->date.push_back( startDate );*/
// exceptions list - try sending empty list even if no exceptions
@@ -704,7 +704,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen
for ( KCal::DateList::ConstIterator it = exceptions.begin(); it != exceptions.end(); ++it )
{
std::string startDate;
- startDate.append( (*it).toString( TQt::ISODate ).utf8() );
+ startDate.append( TQString((*it).toString( Qt::ISODate )).utf8() );
item->exdate->date.push_back( startDate );
}
}
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index eef6a5bf1..e9e05c26e 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.arg(ourHost),
+ msg.tqarg(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.arg(ourHost),
+ msg.tqarg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
KStdGuiItem::cont().text() );
diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp
index 0d99780a4..602321795 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" ).arg( korgVersion );
+ return TQString( "KOrganizer %1, Kolab resource" ).tqarg( korgVersion );
}
// Unhandled KCal::Incidence fields:
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index 59f6a3558..da2cee412 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").arg( addedIncidence->summary() ) );
+ addedIncidence->setSummary( i18n("Copy of: %1").tqarg( 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" ).arg( incidence->summary() ) + "<br>";
+ text += i18n( "<b>Summary:</b> %1" ).tqarg( incidence->summary() ) + "<br>";
if ( !incidence->location().isEmpty() )
- text += i18n( "<b>Location:</b> %1" ).arg( incidence->location() );
+ text += i18n( "<b>Location:</b> %1" ).tqarg( incidence->location() );
text += "<br>";
if ( !incidence->doesFloat() )
text += i18n( "<b>Start:</b> %1, %2" )
- .arg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() );
+ .tqarg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() );
else
- text += i18n( "<b>Start:</b> %1" ).arg( incidence->dtStartDateStr() );
+ text += i18n( "<b>Start:</b> %1" ).tqarg( 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" )
- .arg( event->dtEndDateStr(), event->dtEndTimeStr() );
+ .tqarg( event->dtEndDateStr(), event->dtEndTimeStr() );
} else {
- text += i18n( "<b>End:</b> %1" ).arg( event->dtEndDateStr() );
+ text += i18n( "<b>End:</b> %1" ).tqarg( event->dtEndDateStr() );
}
}
text += "<br>";
@@ -711,7 +711,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
/* Will be needed when kmail triggers a delete, so we don't delete the inocent
* incidence that's sharing the uid with this one */
- mOriginalUID2fakeUID[qMakePair( incidence->schedulingID(), subResource )] = uid;
+ mOriginalUID2fakeUID[tqMakePair( incidence->schedulingID(), subResource )] = uid;
}
}
/* Add to the cache if the add didn't come from KOrganizer, in which case
diff --git a/kresources/kolab/knotes/note.cpp b/kresources/kolab/knotes/note.cpp
index e456e43be..ea5f6b285 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" ).arg( KNOTES_VERSION );
+ return TQString( "KNotes %1, Kolab resource" ).tqarg( KNOTES_VERSION );
}
diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp
index cb04d12be..3341ee35f 100644
--- a/kresources/kolab/shared/kolabbase.cpp
+++ b/kresources/kolab/shared/kolabbase.cpp
@@ -409,12 +409,12 @@ TQDomDocument KolabBase::domTree()
TQString KolabBase::dateTimeToString( const TQDateTime& time )
{
- return time.toString( TQt::ISODate ) + 'Z';
+ return time.toString( Qt::ISODate ) + 'Z';
}
TQString KolabBase::dateToString( const TQDate& date )
{
- return date.toString( TQt::ISODate );
+ return date.toString( Qt::ISODate );
}
TQDateTime KolabBase::stringToDateTime( const TQString& _date )
@@ -423,15 +423,15 @@ TQDateTime KolabBase::stringToDateTime( const TQString& _date )
//Deal with data from some clients that always append a Z to dates.
if ( date.endsWith( "ZZ" ) )
date.truncate( date.length() - 2 );
- //In TQt3, TQt::ISODate cannot handle a trailing Z for UTC, so remove if found.
+ //In TQt3, Qt::ISODate cannot handle a trailing Z for UTC, so remove if found.
else if ( date.endsWith( "Z" ) )
date.truncate( date.length() - 1 );
- return TQDateTime::fromString( date, TQt::ISODate );
+ return TQDateTime::fromString( date, Qt::ISODate );
}
TQDate KolabBase::stringToDate( const TQString& date )
{
- return TQDate::fromString( date, TQt::ISODate );
+ return TQDate::fromString( date, Qt::ISODate );
}
TQString KolabBase::sensitivityToString( Sensitivity s )
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index cf81f4518..90464b6b0 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::tqfromLatin1( firstPartTextToTranslate ).arg( url );
- TQString firstPartText = i18n( firstPartTextToTranslate ).arg( url );
+ TQString firstPartTextUntranslated = TQString::tqfromLatin1( firstPartTextToTranslate ).tqarg( url );
+ TQString firstPartText = i18n( firstPartTextToTranslate ).tqarg( 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" ).arg( type ) );
+ TQString( "kresources/kolab/%1rc" ).tqarg( type ) );
}
bool ResourceKolabBase::connectToKMail() const
diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp
index 06d9f9fc2..f8feb456f 100644
--- a/kresources/lib/folderconfig.cpp
+++ b/kresources/lib/folderconfig.cpp
@@ -47,7 +47,7 @@ FolderConfig::FolderConfig( TQWidget *tqparent )
TQBoxLayout *topLayout = new TQVBoxLayout( this );
topLayout->addSpacing( KDialog::spacingHint() );
- TQGroupBox *topBox = new TQGroupBox( 1, Horizontal, i18n("Folder Selection"),
+ TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Folder Selection"),
this );
topLayout->addWidget( topBox );
diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp
index a0ef5f0e2..9436a6f92 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").arg( i ) ) );
+// TQStringList l( cfgg.readListEntry( TQString("Folder%1").tqarg( 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").arg( nr ), lst );
+// cfgg.writeEntry( TQString("Folder%1").tqarg( nr ), lst );
if ( (*it).active ) active.append( (*it).id );
nr++;
}
diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp
index 23e115c0a..c6b34cbd2 100644
--- a/kresources/lib/folderlistview.cpp
+++ b/kresources/lib/folderlistview.cpp
@@ -147,10 +147,10 @@ void FolderListView::slotPopupHandler( int z )
void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c)
{
if ( dynamic_cast<FolderListItem*>(i) ) {
- if ( btn == TQt::RightButton ) {
+ if ( btn == Qt::RightButton ) {
showPopupMenu( (FolderListItem*)i, /*mapToGlobal(*/pos/*)*/ );
}
- else if ( btn == TQt::LeftButton && c > 0 ) {
+ else if ( btn == Qt::LeftButton && c > 0 ) {
// map pos to item/column and call FolderListItem::activate(col, pos)
((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) );
// } else {
diff --git a/kresources/lib/kcal_resourcegroupwarebase.cpp b/kresources/lib/kcal_resourcegroupwarebase.cpp
index 11db0e81e..2f48362d9 100644
--- a/kresources/lib/kcal_resourcegroupwarebase.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebase.cpp
@@ -217,7 +217,7 @@ void qt_leave_modal( TQWidget *widget );
void ResourceGroupwareBase::enter_loop()
{
TQWidget dummy(0,0,WType_Dialog | WShowModal);
- dummy.setFocusPolicy( TQWidget::NoFocus );
+ dummy.setFocusPolicy( Qt::NoFocus );
qt_enter_modal(&dummy);
tqApp->enter_loop();
qt_leave_modal(&dummy);
diff --git a/kresources/lib/webdavhandler.cpp b/kresources/lib/webdavhandler.cpp
index 0eb2144fa..9ae500e52 100644
--- a/kresources/lib/webdavhandler.cpp
+++ b/kresources/lib/webdavhandler.cpp
@@ -120,7 +120,7 @@ bool WebdavHandler::extractDateTime( const TQDomElement &node, const TQString &e
{
TQDomElement element = node.namedItem( entry ).toElement();
if ( !element.isNull() && !element.text().isEmpty() ) {
- value = TQDateTime::fromString( element.text(), TQt::ISODate );
+ value = TQDateTime::fromString( element.text(), Qt::ISODate );
return true;
}
return false;
diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/kresources/newexchange/exchangeconvertercalendar.cpp
index d28e8b1cf..3ff05eef0 100644
--- a/kresources/newexchange/exchangeconvertercalendar.cpp
+++ b/kresources/newexchange/exchangeconvertercalendar.cpp
@@ -410,7 +410,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
TQStringList::Iterator it = tmplst.begin();
KCal::DateList exdates;
for ( ; it != tmplst.end(); ++it ) {
- exdates.append( /*utcAsZone(*/ TQDateTime::fromString( *it, TQt::ISODate )/*,
+ exdates.append( /*utcAsZone(*/ TQDateTime::fromString( *it, Qt::ISODate )/*,
localTimeZoneId )*/.date() );
}
event->recurrence()->setExDates( exdates );
@@ -593,7 +593,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
void addDateProp( TQDomElement &el ) { el.setAttribute( "b:dt", "dateTime.tz" ); }
void addFloatProp( TQDomElement &el ) { el.setAttribute( "b:dt", "float" ); }
void addIntProp( TQDomElement &el ) { el.setAttribute( "b:dt", "int" ); }
- TQString timePropString( const TQDateTime &dt ) { return dt.toString( TQt::ISODate )+"Z"; }
+ TQString timePropString( const TQDateTime &dt ) { return dt.toString( Qt::ISODate )+"Z"; }
bool visitIncidence( Incidence *incidence )
{
@@ -730,8 +730,8 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
/* FIXME:
domCalendarProperty( "uid", todo->uid() );
- domCalendarProperty( "created", todo->created().toString( TQt::ISODate ) );
- domCalendarProperty( "lastmodified", todo->lastModified().toString( TQt::ISODate ) );*/
+ domCalendarProperty( "created", todo->created().toString( Qt::ISODate ) );
+ domCalendarProperty( "lastmodified", todo->lastModified().toString( Qt::ISODate ) );*/
// TODO
/*propertyTask1( TaskProp_Owner );
propertyTask2( TaskProp_ContactNames );
@@ -758,8 +758,8 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
"outlookmessageclass", "IPM.Journal" );
/* FIXME:
domCalendarProperty( "uid", todo->uid() );
- domCalendarProperty( "created", todo->created().toString( TQt::ISODate ) );
- domCalendarProperty( "lastmodified", todo->lastModified().toString( TQt::ISODate ) );*/
+ domCalendarProperty( "created", todo->created().toString( Qt::ISODate ) );
+ domCalendarProperty( "lastmodified", todo->lastModified().toString( Qt::ISODate ) );*/
// TODO
return true;
}
diff --git a/kresources/remote/resourceremote.cpp b/kresources/remote/resourceremote.cpp
index 229dd86bf..18b8782e1 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").arg( mDownloadUrl.prettyURL() );
+ txt += i18n("URL: %1").tqarg( 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 b8abb42aa..f9a02d448 100644
--- a/kresources/scalix/kabc/contact.cpp
+++ b/kresources/scalix/kabc/contact.cpp
@@ -71,7 +71,7 @@ TQString Contact::toXml( const KABC::Addressee &addr )
xml += "<reminder_set>" + custom( "reminder_set", addr, "false" ) + "</reminder_set>\n";
xml += "<send_rich_info>" + custom( "send_rich_info", addr, "false" ) + "</send_rich_info>\n";
xml += "<subject>" + addr.formattedName() + "</subject>\n";
- xml += "<last_modification_time>" + addr.revision().toString( TQt::ISODate ) + "</last_modification_time>\n";
+ xml += "<last_modification_time>" + addr.revision().toString( Qt::ISODate ) + "</last_modification_time>\n";
xml += "<display_name_prefix>" + addr.prefix() + "</display_name_prefix>\n";
xml += "<first_name>" + addr.givenName() + "</first_name>\n";
@@ -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" ).arg( i + 1 ), addr );
- display = custom( TQString( "email%1_display_name" ).arg( i + 1 ), addr );
+ comment = custom( TQString( "email%1_address_with_comment" ).tqarg( i + 1 ), addr );
+ display = custom( TQString( "email%1_display_name" ).tqarg( i + 1 ), addr );
}
}
- 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";
+ 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";
}
KABC::PhoneNumber phone = addr.phoneNumber( KABC::PhoneNumber::Home );
@@ -166,7 +166,7 @@ TQString Contact::toXml( const KABC::Addressee &addr )
xml += "<office_location>" + addr.custom( "KADDRESSBOOK", "X-Office" ) + "</office_location>\n";
xml += "<spouse>" + addr.custom( "KADDRESSBOOK", "X-SpousesName" ) + "</spouse>\n";
- xml += "<bday>" + addr.birthday().toString( TQt::ISODate ) + "</bday>\n";
+ xml += "<bday>" + addr.birthday().toString( Qt::ISODate ) + "</bday>\n";
xml += "<anniversary>" + addr.custom( "KADDRESSBOOK", "X-Anniversary" ) + "</anniversary>\n";
xml += "<mapi_charset>" + custom( "mapi_charset", addr, "UTF8" ) + "</mapi_charset>";
@@ -235,7 +235,7 @@ KABC::Addressee Contact::fromXml( const TQString &xml )
else if ( element.tagName() == "send_rich_info" )
setCustom( "send_rich_info", element.text(), addr );
else if ( element.tagName() == "last_modification_time" )
- addr.setRevision( TQDateTime::fromString( element.text(), TQt::ISODate ) );
+ addr.setRevision( TQDateTime::fromString( element.text(), Qt::ISODate ) );
// name
else if ( element.tagName() == "display_name_prefix" )
@@ -352,7 +352,7 @@ KABC::Addressee Contact::fromXml( const TQString &xml )
addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", element.text() );
else if ( element.tagName() == "bday" )
- addr.setBirthday( TQDateTime::fromString( element.text(), TQt::ISODate ) );
+ addr.setBirthday( TQDateTime::fromString( element.text(), Qt::ISODate ) );
else if ( element.tagName() == "anniversary" )
addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", element.text() );
else
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index 8c84977a8..a67585ee0 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").arg(localIncidence->summary()) );
+ localIncidence->setSummary( i18n("Copy of: %1").tqarg(localIncidence->summary()) );
addedIncidence = inc;
}
bool silent = mSilent;
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index c3a8f99b0..d5603af92 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" ).arg( requestUser );
- const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).arg( argument.length() );
+ 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() );
stream << (int) 'X' << 'E' << command << argument;
- TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
+ TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ?
url.user() : url.user() + ":" + url.pass() )
- .arg( url.host() );
+ .tqarg( url.host() );
mFreeBusyData = TQString();
@@ -134,7 +134,7 @@ void Scalix::publishFreeBusy( const KURL &url )
TQString path = url.path();
// extract user name
- int lastSlash = path.findRev( '/' );
+ int lastSlash = path.tqfindRev( '/' );
if ( lastSlash != -1 )
requestUser = path.mid( lastSlash + 1 );
@@ -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}" ).arg( argument.length() );
+ const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).tqarg( argument.length() );
stream << (int) 'X' << 'E' << command << argument;
- TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
+ TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ?
url.user() : url.user() + ":" + url.pass() )
- .arg( url.host() );
+ .tqarg( 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 f1bce9f2c..2d6823918 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" ).arg( oldPassword ).arg( newPassword );
+ << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).tqarg( oldPassword ).tqarg( 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" ).arg( email ).arg( types.join( " " ) );
+ << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).tqarg( email ).tqarg( 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}" ).arg( enabled ? "ENABLED" : "DISABLED" )
- .arg( "UTF-8" )
- .arg( msg.utf8().length() );
+ const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).tqarg( enabled ? "ENABLED" : "DISABLED" )
+ .tqarg( "UTF-8" )
+ .tqarg( 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 04351395e..bade9e16b 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)" ).arg( obj.attrs[ "surname" ].first() )
- .arg( obj.attrs[ "mail" ].first() );
+ const TQString text = TQString( "%1 (%2)" ).tqarg( TQString(obj.attrs[ "surname" ].first()) )
+ .tqarg( TQString(obj.attrs[ "mail" ].first()) );
new LdapItem( this, text, obj.attrs[ "mail" ].first() );
}
diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp
index d56e8954e..7b2f2ac60 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.cpp
+++ b/kresources/scalix/scalixadmin/outofofficepage.cpp
@@ -38,7 +38,7 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *tqparent )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 );
- TQButtonGroup *group = new TQButtonGroup( 1, TQt::Vertical, this );
+ TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this );
mDisabled = new TQRadioButton( i18n( "I am in the office" ), group );
mDisabled->setChecked( true );
diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp
index 53a163b83..0781e3a41 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" ).arg( group.readNumEntry( "Folder" ) ) );
+ KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).tqarg( group.readNumEntry( "Folder" ) ) );
fileGroup.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
}
}
diff --git a/kresources/scalix/scalixadmin/settings.cpp b/kresources/scalix/scalixadmin/settings.cpp
index 52f72296f..d5c5cdb1c 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" ).arg( group.readEntry( "host" ) )
- .arg( group.readEntry( "user" ) );
+ url = TQString( "http://%1/Scalix/rw/?username=%2" ).tqarg( group.readEntry( "host" ) )
+ .tqarg( group.readEntry( "user" ) );
}
return url;
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index c9c7ee11d..c9bfca350 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" ).arg( type ) );
+ TQString( "kresources/scalix/%1rc" ).tqarg( type ) );
}
bool ResourceScalixBase::connectToKMail() const
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index 64400e4f8..337899035 100644
--- a/kresources/scalix/shared/scalixbase.cpp
+++ b/kresources/scalix/shared/scalixbase.cpp
@@ -372,12 +372,12 @@ TQDomDocument ScalixBase::domTree()
TQString ScalixBase::dateTimeToString( const TQDateTime& time )
{
- return time.toString( TQt::ISODate ) + 'Z';
+ return time.toString( Qt::ISODate ) + 'Z';
}
TQString ScalixBase::dateToString( const TQDate& date )
{
- return date.toString( TQt::ISODate );
+ return date.toString( Qt::ISODate );
}
TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
@@ -385,12 +385,12 @@ TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
TQString date( _date );
if ( date.endsWith( "Z" ) )
date.truncate( date.length() - 1 );
- return TQDateTime::fromString( date, TQt::ISODate );
+ return TQDateTime::fromString( date, Qt::ISODate );
}
TQDate ScalixBase::stringToDate( const TQString& date )
{
- return TQDate::fromString( date, TQt::ISODate );
+ return TQDate::fromString( date, Qt::ISODate );
}
TQString ScalixBase::sensitivityToString( Sensitivity s )
diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp
index 76e233ce8..82d5c60a5 100644
--- a/kresources/slox/kabcresourceslox.cpp
+++ b/kresources/slox/kabcresourceslox.cpp
@@ -401,7 +401,7 @@ void ResourceSlox::parseContactAttribute( const TQDomElement &e, Addressee &a )
a.insertCustom( "KADDRESSBOOK", "X-SpousesName", text );
} else if ( tag == fieldName( Anniversary ) ) {
TQDateTime dt = WebdavHandler::sloxToTQDateTime( text );
- a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( TQt::ISODate ) );
+ a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( Qt::ISODate ) );
} else if ( tag == fieldName( Categories ) ) {
a.setCategories( TQStringList::split( TQRegExp(",\\s*"), text ) );
} else if ( type() == "ox" ) { // FIXME: Address reading is missing for SLOX
@@ -576,7 +576,7 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop
TQString anniversary = a.custom( "KADDRESSBOOK", "X-Anniversary" );
if ( !anniversary.isEmpty() )
WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ),
- WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, TQt::ISODate ).date() ) );
+ WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, Qt::ISODate ).date() ) );
else
WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ) );
}
diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp
index 40afcd7e8..132f19ca1 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'").arg( p );
+ TQString err = i18n("Non-http protocol: '%1'").tqarg( p );
kdDebug() << "KCalResourceSlox::load(): " << err << endl;
loadError( err );
return false;
diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp
index b010e0e92..4bd588c4b 100644
--- a/kresources/slox/webdavhandler.cpp
+++ b/kresources/slox/webdavhandler.cpp
@@ -199,7 +199,7 @@ TQDateTime WebdavHandler::sloxToTQDateTime( const TQString &str )
TQDateTime dt;
if (preEpoch) {
- dt.setTime_t( 0, TQt::UTC );
+ dt.setTime_t( 0, Qt::UTC );
if (ticks > INT_MAX) {
dt = dt.addSecs(-INT_MAX);
ticks -= INT_MAX;
@@ -208,7 +208,7 @@ TQDateTime WebdavHandler::sloxToTQDateTime( const TQString &str )
}
else
{
- dt.setTime_t( ticks, TQt::UTC );
+ dt.setTime_t( ticks, Qt::UTC );
}
return dt;