summaryrefslogtreecommitdiffstats
path: root/tderesources/caldav
diff options
context:
space:
mode:
Diffstat (limited to 'tderesources/caldav')
-rw-r--r--tderesources/caldav/config.cpp8
-rw-r--r--tderesources/caldav/config.h4
-rw-r--r--tderesources/caldav/configwidgets.cpp8
-rw-r--r--tderesources/caldav/configwidgets.h6
-rw-r--r--tderesources/caldav/resource.cpp18
-rw-r--r--tderesources/caldav/resource.h4
6 files changed, 24 insertions, 24 deletions
diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp
index b83660f8..4a9888ea 100644
--- a/tderesources/caldav/config.cpp
+++ b/tderesources/caldav/config.cpp
@@ -167,12 +167,12 @@ void ResourceCalDavConfig::setupUI() {
mainLayout->addWidget(mRememberPassword, 8, 1);
mTasksUrl->setEnabled(mUseSTasks->isChecked());
- connect( mUseSTasks, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotSTasksToggled( bool ) ) );
+ connect( mUseSTasks, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotSTasksToggled( bool ) ) );
mJournalsUrl->setEnabled(mUseSJournals->isChecked());
- connect( mUseSJournals, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotSJournalsToggled( bool ) ) );
+ connect( mUseSJournals, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotSJournalsToggled( bool ) ) );
// configs
TQHBoxLayout* horizontal = new TQHBoxLayout(this);
diff --git a/tderesources/caldav/config.h b/tderesources/caldav/config.h
index 4dec65f3..23ea20fb 100644
--- a/tderesources/caldav/config.h
+++ b/tderesources/caldav/config.h
@@ -19,7 +19,7 @@
#include "resource.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <tderesources/configwidget.h>
class TQLineEdit;
@@ -37,7 +37,7 @@ class CalDavSaveConfig;
/**
* Configuration widget for CalDAV resource.
*/
-class KDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget
+class TDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget
{
TQ_OBJECT
diff --git a/tderesources/caldav/configwidgets.cpp b/tderesources/caldav/configwidgets.cpp
index 7e003dcd..9f4f1e11 100644
--- a/tderesources/caldav/configwidgets.cpp
+++ b/tderesources/caldav/configwidgets.cpp
@@ -103,8 +103,8 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent )
d->mGroup->insert( automaticReloadOnStartup, 1 );
d->mGroup->insert( noAutomaticReload, 0 );
- connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotIntervalToggled( bool ) ) );
TQHBox *intervalBox = new TQHBox( groupBox );
//new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
@@ -179,8 +179,8 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent )
d->mGroup->insert( onExit, 1 );
d->mGroup->insert( intervalRadio, 2 );
- connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotIntervalToggled( bool ) ) );
TQHBox *intervalBox = new TQHBox( groupBox );
//new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
diff --git a/tderesources/caldav/configwidgets.h b/tderesources/caldav/configwidgets.h
index 5bee6aa9..07362c01 100644
--- a/tderesources/caldav/configwidgets.h
+++ b/tderesources/caldav/configwidgets.h
@@ -36,7 +36,7 @@
#define KCALDAV_AUTOWIDGETS_H
#include <tqwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
namespace KCal {
@@ -47,7 +47,7 @@ class ResourceCached;
@see ResourceCached
*/
-class KDE_EXPORT CalDavReloadConfig : public TQWidget
+class TDE_EXPORT CalDavReloadConfig : public TQWidget
{
TQ_OBJECT
@@ -74,7 +74,7 @@ class KDE_EXPORT CalDavReloadConfig : public TQWidget
@see ResourceCached
*/
-class KDE_EXPORT CalDavSaveConfig : public TQWidget
+class TDE_EXPORT CalDavSaveConfig : public TQWidget
{
TQ_OBJECT
diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp
index 8fae5c98..9ab685c8 100644
--- a/tderesources/caldav/resource.cpp
+++ b/tderesources/caldav/resource.cpp
@@ -197,7 +197,7 @@ bool ResourceCalDav::doSave() {
clearChanges();
if (mWriteRetryTimer != NULL) {
if (mWriteRetryTimer->isActive() == false) {
- disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) );
+ disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) );
delete mWriteRetryTimer;
mWriteRetryTimer = NULL;
}
@@ -249,8 +249,8 @@ void ResourceCalDav::init() {
// creating jobs
// TQt4 handles this quite differently, as shown below,
// whereas TQt3 needs events (see ::event())
-// connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished()));
-// connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished()));
+// connect(mLoader, TQ_SIGNAL(finished()), this, TQ_SLOT(loadFinished()));
+// connect(mWriter, TQ_SIGNAL(finished()), this, TQ_SLOT(writingFinished()));
setType("ResourceCalDav");
}
@@ -827,14 +827,14 @@ bool ResourceCalDav::event ( TQEvent * e ) {
if (e->type() == 1000) {
// Read done
loadFinished();
- return TRUE;
+ return true;
}
else if (e->type() == 1001) {
// Write done
writingFinished();
- return TRUE;
+ return true;
}
- else return FALSE;
+ else return false;
}
void ResourceCalDav::releaseReadLockout() {
@@ -850,9 +850,9 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl,
if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) {
if (mWriteRetryTimer == NULL) {
mWriteRetryTimer = new TQTimer(this);
- connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) );
+ connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) );
}
- mWriteRetryTimer->start(1000, TRUE);
+ mWriteRetryTimer->start(1000, true);
return false;
}
@@ -995,7 +995,7 @@ void ResourceCalDav::writingFinished() {
}
// Give the remote system a few seconds to process the data before we allow any read operations
- TQTimer::singleShot( 3000, this, TQT_SLOT(releaseReadLockout()) );
+ TQTimer::singleShot( 3000, this, TQ_SLOT(releaseReadLockout()) );
// Writing queue and mWritingQueueReady flag are not shared resources, i.e. only one thread has an access to them.
// That's why no mutexes are required.
diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h
index 7e4bbdc5..326806b1 100644
--- a/tderesources/caldav/resource.h
+++ b/tderesources/caldav/resource.h
@@ -26,7 +26,7 @@
#include <tdeabc/locknull.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <tdeconfig.h>
namespace KCal {
@@ -41,7 +41,7 @@ class CalDavWriter;
/**
* This class provides a resource for accessing calendars via CalDAV protocol.
*/
-class KDE_EXPORT ResourceCalDav : public ResourceCached
+class TDE_EXPORT ResourceCalDav : public ResourceCached
{
TQ_OBJECT