summaryrefslogtreecommitdiffstats
path: root/kresources/slox
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/slox')
-rw-r--r--kresources/slox/kabcresourceslox.cpp4
-rw-r--r--kresources/slox/kabcresourcesloxconfig.cpp2
-rw-r--r--kresources/slox/kcalresourceslox.cpp16
-rw-r--r--kresources/slox/kcalresourcesloxconfig.cpp2
-rw-r--r--kresources/slox/sloxbase.h2
-rw-r--r--kresources/slox/webdavhandler.cpp8
-rw-r--r--kresources/slox/webdavhandler.h6
7 files changed, 20 insertions, 20 deletions
diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp
index 6412de4a0..f45108b42 100644
--- a/kresources/slox/kabcresourceslox.cpp
+++ b/kresources/slox/kabcresourceslox.cpp
@@ -218,7 +218,7 @@ bool ResourceSlox::asyncLoad()
TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
TQT_SLOT( cancelDownload() ) );
- mPrefs->setLastSync( TQDateTime::currentDateTime() );
+ mPrefs->setLastSync( TQDateTime::tqcurrentDateTime() );
return true;
}
@@ -255,7 +255,7 @@ void ResourceSlox::slotResult( KIO::Job *job )
Addressee a;
a.setUid( uid );
- mWebdavHandler.clearSloxAttributeStatus();
+ mWebdavHandler.clearSloxAttributetqStatus();
TQDomNode n;
for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) {
diff --git a/kresources/slox/kabcresourcesloxconfig.cpp b/kresources/slox/kabcresourcesloxconfig.cpp
index 0ae1f431f..d9e32a556 100644
--- a/kresources/slox/kabcresourcesloxconfig.cpp
+++ b/kresources/slox/kabcresourcesloxconfig.cpp
@@ -35,7 +35,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
using namespace KABC;
diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp
index 14f3bab62..a47c64b6f 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;
@@ -237,7 +237,7 @@ void KCalResourceSlox::requestEvents()
TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
TQT_SLOT( cancelLoadEvents() ) );
- mPrefs->setLastEventSync( TQDateTime::currentDateTime() );
+ mPrefs->setLastEventSync( TQDateTime::tqcurrentDateTime() );
}
void KCalResourceSlox::requestTodos()
@@ -282,7 +282,7 @@ void KCalResourceSlox::requestTodos()
TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
TQT_SLOT( cancelLoadTodos() ) );
- mPrefs->setLastTodoSync( TQDateTime::currentDateTime() );
+ mPrefs->setLastTodoSync( TQDateTime::tqcurrentDateTime() );
}
void KCalResourceSlox::uploadIncidences()
@@ -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->setqStatus( Attendee::Accepted );
} else if ( status == "decline" ) {
- a->seStatus( Attendee::Declined );
+ a->setqStatus( Attendee::Declined );
} else {
- a->seStatus( Attendee::NeedsAction );
+ a->setqStatus( Attendee::NeedsAction );
}
}
} else {
@@ -953,7 +953,7 @@ void KCalResourceSlox::slotLoadTodosResult( KIO::Job *job )
todo->setCustomProperty( "SLOX", "ID", item.sloxId );
- mWebdavHandler.clearSloxAttributeStatus();
+ mWebdavHandler.clearSloxAttributetqStatus();
TQDomNode n;
for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) {
@@ -1032,7 +1032,7 @@ void KCalResourceSlox::slotLoadEventsResult( KIO::Job *job )
bool doesRecur = false;
- mWebdavHandler.clearSloxAttributeStatus();
+ mWebdavHandler.clearSloxAttributetqStatus();
for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) {
TQDomElement e = n.toElement();
diff --git a/kresources/slox/kcalresourcesloxconfig.cpp b/kresources/slox/kcalresourcesloxconfig.cpp
index 9038d4f16..e09cf85c1 100644
--- a/kresources/slox/kcalresourcesloxconfig.cpp
+++ b/kresources/slox/kcalresourcesloxconfig.cpp
@@ -21,7 +21,7 @@
#include <typeinfo>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <klocale.h>
diff --git a/kresources/slox/sloxbase.h b/kresources/slox/sloxbase.h
index 8e9309c9d..6f291c8f6 100644
--- a/kresources/slox/sloxbase.h
+++ b/kresources/slox/sloxbase.h
@@ -35,7 +35,7 @@ class KDE_EXPORT SloxBase {
FolderId,
LastSync,
ObjectType,
- ObjecStatus,
+ ObjectqStatus,
CreatedBy,
Categories,
IncidenceTitle, // incidence fields
diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp
index 6b2c733a4..cb8acde02 100644
--- a/kresources/slox/webdavhandler.cpp
+++ b/kresources/slox/webdavhandler.cpp
@@ -129,9 +129,9 @@ TQValueList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const TQDomDoc
item.status = SloxItem::New;
}
- TQDomNode sloxStatus = prop.namedItem( res->fieldName( SloxBase::ObjecStatus ) );
- if ( !sloxStatus.isNull() ) {
- TQDomElement sloxStatusElement = sloxStatus.toElement();
+ TQDomNode sloxtqStatus = prop.namedItem( res->fieldName( SloxBase::ObjectqStatus ) );
+ if ( !sloxtqStatus.isNull() ) {
+ TQDomElement sloxStatusElement = sloxtqStatus.toElement();
if ( sloxStatusElement.text() == "DELETE" ) {
item.status = SloxItem::Delete;
} else if ( sloxStatusElement.text() == "CREATE" ) {
@@ -276,7 +276,7 @@ void WebdavHandler::parseSloxAttribute( const TQDomElement &e )
}
}
-void WebdavHandler::clearSloxAttributeStatus()
+void WebdavHandler::clearSloxAttributetqStatus()
{
if ( mRes->resType() == "ox" )
mWritable = true; // parseSloxAttribute() won't work for OX
diff --git a/kresources/slox/webdavhandler.h b/kresources/slox/webdavhandler.h
index 136be879e..8dedf0a72 100644
--- a/kresources/slox/webdavhandler.h
+++ b/kresources/slox/webdavhandler.h
@@ -37,14 +37,14 @@ class SloxBase;
class KDE_EXPORT SloxItem
{
public:
- enum Status { Invalid, Delete, Create, New };
+ enum tqStatus { Invalid, Delete, Create, New };
SloxItem();
TQDomNode domNode;
TQString sloxId;
TQString clientId;
- Status status;
+ tqStatus status;
TQString response;
TQString responseDescription;
};
@@ -78,7 +78,7 @@ class KDE_EXPORT WebdavHandler
static TQValueList<SloxItem> getSloxItems( SloxBase *res, const TQDomDocument &doc );
- void clearSloxAttributeStatus();
+ void clearSloxAttributetqStatus();
void parseSloxAttribute( const TQDomElement & );
void setSloxAttributes( KCal::Incidence * );
void setSloxAttributes( KABC::Addressee & );
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 00:28:27 +0000