summaryrefslogtreecommitdiffstats
path: root/kresources/slox
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/slox
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/slox')
-rw-r--r--kresources/slox/kabcresourceslox.cpp4
-rw-r--r--kresources/slox/kcalresourceslox.cpp2
-rw-r--r--kresources/slox/webdavhandler.cpp4
3 files changed, 5 insertions, 5 deletions
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;