summaryrefslogtreecommitdiffstats
path: root/tderesources/kolab
diff options
context:
space:
mode:
Diffstat (limited to 'tderesources/kolab')
-rw-r--r--tderesources/kolab/kcal/resourcekolab.cpp12
-rw-r--r--tderesources/kolab/kcal/resourcekolab.h10
-rw-r--r--tderesources/kolab/knotes/resourcekolab.h4
-rw-r--r--tderesources/kolab/shared/kmailconnection.cpp16
-rw-r--r--tderesources/kolab/shared/kolabbase.cpp10
-rw-r--r--tderesources/kolab/shared/resourcekolabbase.cpp2
-rw-r--r--tderesources/kolab/tdeabc/resourcekolab.cpp2
-rw-r--r--tderesources/kolab/tdeabc/resourcekolab.h4
8 files changed, 30 insertions, 30 deletions
diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index 869ddca8..d19a2576 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -77,8 +77,8 @@ ResourceKolab::ResourceKolab( const TDEConfig *config )
setResourceName( i18n( "Kolab Server" ) );
}
setType( "imap" );
- connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotEmitResourceChanged() ) );
+ connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotEmitResourceChanged() ) );
}
ResourceKolab::~ResourceKolab()
@@ -176,7 +176,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
int progressId = 0;
if ( useProgress ) {
- progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
+ progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true );
uiserver.totalFiles( progressId, count );
uiserver.infoMessage( progressId, labelTxt );
uiserver.transferring( progressId, labelTxt );
@@ -402,7 +402,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre
KIncidenceChooser* ch = new KIncidenceChooser();
ch->setIncidence( local ,inc );
if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) {
- connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT ( useGlobalMode() ) );
+ connect ( this, TQ_SIGNAL( useGlobalMode() ), ch, TQ_SLOT ( useGlobalMode() ) );
if ( ch->exec() ) {
if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask ) {
emit useGlobalMode() ;
@@ -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[tqMakePair( incidence->schedulingID(), subResource )] = uid;
+ mOriginalUID2fakeUID[qMakePair( incidence->schedulingID(), subResource )] = uid;
}
}
/* Add to the cache if the add didn't come from KOrganizer, in which case
@@ -1185,7 +1185,7 @@ void ResourceKolab::setSubresourceActive( const TQString &subresource, bool v )
}
mResourceChangedTimer.changeInterval( 100 );
}
- TQTimer::singleShot( 0, this, TQT_SLOT(writeConfig()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(writeConfig()) );
}
bool ResourceKolab::subresourceWritable( const TQString& subresource ) const
diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h
index a8404cd3..289e894d 100644
--- a/tderesources/kolab/kcal/resourcekolab.h
+++ b/tderesources/kolab/kcal/resourcekolab.h
@@ -37,7 +37,7 @@
#include <tqtimer.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <libkcal/calendarlocal.h>
#include <libkcal/icalformat.h>
#include <libkcal/resourcecalendar.h>
@@ -47,7 +47,7 @@ namespace KCal {
struct TemporarySilencer;
-class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar,
+class TDE_EXPORT ResourceKolab : public KCal::ResourceCalendar,
public KCal::IncidenceBase::Observer,
public Kolab::ResourceKolabBase
{
@@ -71,7 +71,7 @@ public:
void doClose();
// The libkcal functions. See the resource for descriptions
- KDE_DEPRECATED bool addEvent( KCal::Event *event );
+ TDE_DEPRECATED bool addEvent( KCal::Event *event );
bool addEvent( KCal::Event *event, const TQString &subResource );
bool deleteEvent( KCal::Event * );
KCal::Event* event( const TQString &UniqueStr );
@@ -84,14 +84,14 @@ public:
KCal::Event::List rawEvents( const TQDate& start, const TQDate& end,
bool inclusive = false );
- KDE_DEPRECATED bool addTodo( KCal::Todo * todo );
+ TDE_DEPRECATED bool addTodo( KCal::Todo * todo );
bool addTodo( KCal::Todo *todo, const TQString &subResource );
bool deleteTodo( KCal::Todo * );
KCal::Todo* todo( const TQString &uid );
KCal::Todo::List rawTodos( TodoSortField sortField = TodoSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
KCal::Todo::List rawTodosForDate( const TQDate& date );
- KDE_DEPRECATED bool addJournal( KCal::Journal * );
+ TDE_DEPRECATED bool addJournal( KCal::Journal * );
bool addJournal( KCal::Journal *, const TQString &subResource );
bool deleteJournal( KCal::Journal * );
KCal::Journal* journal( const TQString &uid );
diff --git a/tderesources/kolab/knotes/resourcekolab.h b/tderesources/kolab/knotes/resourcekolab.h
index 5f1023b4..747c2ea4 100644
--- a/tderesources/kolab/knotes/resourcekolab.h
+++ b/tderesources/kolab/knotes/resourcekolab.h
@@ -39,7 +39,7 @@
#include <libkcal/calendarlocal.h>
#include "../shared/resourcekolabbase.h"
#include "../shared/subresource.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
namespace Kolab {
@@ -49,7 +49,7 @@ namespace Kolab {
* addresses in an IMAP folder in KMail (or other conforming email
* clients).
*/
-class KDE_EXPORT ResourceKolab : public ResourceNotes,
+class TDE_EXPORT ResourceKolab : public ResourceNotes,
public KCal::IncidenceBase::Observer,
public ResourceKolabBase
{
diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp
index 8011c15d..24d9c25e 100644
--- a/tderesources/kolab/shared/kmailconnection.cpp
+++ b/tderesources/kolab/shared/kmailconnection.cpp
@@ -55,14 +55,14 @@ KMailConnection::KMailConnection( ResourceKolabBase* resource,
mDCOPClient->attach();
mDCOPClient->registerAs( objId, true );
- kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
- this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+ tdeApp->dcopClient()->setNotifications( true );
+ connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+ this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
}
KMailConnection::~KMailConnection()
{
- kapp->dcopClient()->setNotifications( false );
+ tdeApp->dcopClient()->setNotifications( false );
delete mKMailIcalIfaceStub;
mKMailIcalIfaceStub = 0;
delete mDCOPClient;
@@ -78,13 +78,13 @@ bool KMailConnection::connectToKMail()
// if we are kmail (and probably kontact as well) ourselves, don't try to start us again
// this prevents a DCOP deadlock when launching the kmail while kontact is the IMAP backend
// provider (and probably vice versa)
- if ( kapp->instanceName() == "kmail" ) {
+ if ( tdeApp->instanceName() == "kmail" ) {
// someone, probably ourselves, already offers the interface, if not stop here
- const QCStringList services = kapp->dcopClient()->registeredApplications();
+ const QCStringList services = tdeApp->dcopClient()->registeredApplications();
for ( uint i = 0; i < services.count(); ++i ) {
if ( services[i].find( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway?
continue;
- const QCStringList objs = kapp->dcopClient()->remoteObjects( services[i] );
+ const QCStringList objs = tdeApp->dcopClient()->remoteObjects( services[i] );
if ( objs.contains( dcopObjectId ) ) {
dcopService = services[i];
break;
@@ -107,7 +107,7 @@ bool KMailConnection::connectToKMail()
}
}
- mKMailIcalIfaceStub = new KMailICalIface_stub( kapp->dcopClient(),
+ mKMailIcalIfaceStub = new KMailICalIface_stub( tdeApp->dcopClient(),
dcopService, dcopObjectId );
// Attach to the KMail signals
diff --git a/tderesources/kolab/shared/kolabbase.cpp b/tderesources/kolab/shared/kolabbase.cpp
index 1dc5418b..5834fd1f 100644
--- a/tderesources/kolab/shared/kolabbase.cpp
+++ b/tderesources/kolab/shared/kolabbase.cpp
@@ -409,12 +409,12 @@ TQDomDocument KolabBase::domTree()
TQString KolabBase::dateTimeToString( const TQDateTime& time )
{
- return time.toString( Qt::ISODate ) + 'Z';
+ return time.toString( TQt::ISODate ) + 'Z';
}
TQString KolabBase::dateToString( const TQDate& date )
{
- return date.toString( Qt::ISODate );
+ return date.toString( TQt::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, Qt::ISODate cannot handle a trailing Z for UTC, so remove if found.
+ //In TQt3, TQt::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, Qt::ISODate );
+ return TQDateTime::fromString( date, TQt::ISODate );
}
TQDate KolabBase::stringToDate( const TQString& date )
{
- return TQDate::fromString( date, Qt::ISODate );
+ return TQDate::fromString( date, TQt::ISODate );
}
TQString KolabBase::sensitivityToString( Sensitivity s )
diff --git a/tderesources/kolab/shared/resourcekolabbase.cpp b/tderesources/kolab/shared/resourcekolabbase.cpp
index ce53bad3..600c1393 100644
--- a/tderesources/kolab/shared/resourcekolabbase.cpp
+++ b/tderesources/kolab/shared/resourcekolabbase.cpp
@@ -37,7 +37,7 @@
#include <folderselectdialog.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kinputdialog.h>
#include <kurl.h>
#include <tdetempfile.h>
diff --git a/tderesources/kolab/tdeabc/resourcekolab.cpp b/tderesources/kolab/tdeabc/resourcekolab.cpp
index 7476212e..4415ce2e 100644
--- a/tderesources/kolab/tdeabc/resourcekolab.cpp
+++ b/tderesources/kolab/tdeabc/resourcekolab.cpp
@@ -201,7 +201,7 @@ bool TDEABC::ResourceKolab::loadSubResource( const TQString& subResource )
UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
int progressId = 0;
if ( count > 200 ) {
- progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
+ progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true );
uiserver.totalFiles( progressId, count );
uiserver.infoMessage( progressId, i18n( "Loading contacts..." ) );
uiserver.transferring( progressId, "Contacts" );
diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h
index 3347a177..dd3dab6b 100644
--- a/tderesources/kolab/tdeabc/resourcekolab.h
+++ b/tderesources/kolab/tdeabc/resourcekolab.h
@@ -38,7 +38,7 @@
#include "../shared/resourcekolabbase.h"
#include "../shared/subresource.h"
#include <kmail/kmailicalIface.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
namespace TDEABC {
@@ -49,7 +49,7 @@ namespace TDEABC {
* addresses in an Kolab folder in KMail (or other conforming email
* clients).
*/
-class KDE_EXPORT ResourceKolab : public KPIM::ResourceABC,
+class TDE_EXPORT ResourceKolab : public KPIM::ResourceABC,
public Kolab::ResourceKolabBase
{
TQ_OBJECT
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-23 18:11:10 +0000