Replace KDE_DEPRECATED with TDE_DEPRECATED

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 2f5f281048)
r14.1.x
Michele Calgaro 7 months ago
parent a6bbab7442
commit 47025f3e88
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -39,7 +39,7 @@
#ifndef LIBKLEOPATRA_NO_COMPAT #ifndef LIBKLEOPATRA_NO_COMPAT
namespace Kleo { namespace Kleo {
//typedef CryptoBackendFactory CryptPlugFactory KDE_DEPRECATED; //typedef CryptoBackendFactory CryptPlugFactory TDE_DEPRECATED;
} }
class CryptPlugWrapper; class CryptPlugWrapper;

@ -340,7 +340,7 @@ class LIBKCAL_EXPORT CalendarResources :
@deprecated use @deprecated use
addIncidence(Incidence *,ResourceCalendar *,const TQString &) instead. addIncidence(Incidence *,ResourceCalendar *,const TQString &) instead.
*/ */
KDE_DEPRECATED bool addIncidence( Incidence *incidence, ResourceCalendar *resource ); TDE_DEPRECATED bool addIncidence( Incidence *incidence, ResourceCalendar *resource );
/** /**
Insert an Incidence into a Calendar Resource. Insert an Incidence into a Calendar Resource.
@ -362,7 +362,7 @@ class LIBKCAL_EXPORT CalendarResources :
@return false if the resource could not be computed or if a ticket @return false if the resource could not be computed or if a ticket
request fails; true otherwise. request fails; true otherwise.
*/ */
KDE_DEPRECATED bool beginChange( Incidence *incidence ); TDE_DEPRECATED bool beginChange( Incidence *incidence );
/** /**
Flag that a change to a Calendar Incidence is starting. Flag that a change to a Calendar Incidence is starting.
@ -385,7 +385,7 @@ class LIBKCAL_EXPORT CalendarResources :
@return false if the resource could not be computed or if a ticket @return false if the resource could not be computed or if a ticket
save fails; true otherwise. save fails; true otherwise.
*/ */
KDE_DEPRECATED bool endChange( Incidence *incidence ); TDE_DEPRECATED bool endChange( Incidence *incidence );
/** /**
Flag that a change to a Calendar Incidence has completed. Flag that a change to a Calendar Incidence has completed.
@ -427,7 +427,7 @@ class LIBKCAL_EXPORT CalendarResources :
@deprecated use @deprecated use
addIncidence(Incidence *,ResourceCalendar *,const TQString&) instead. addIncidence(Incidence *,ResourceCalendar *,const TQString&) instead.
*/ */
KDE_DEPRECATED bool addEvent( Event *event, ResourceCalendar *resource ); TDE_DEPRECATED bool addEvent( Event *event, ResourceCalendar *resource );
/** /**
Insert an Event into a Calendar Resource. Insert an Event into a Calendar Resource.
@ -544,7 +544,7 @@ class LIBKCAL_EXPORT CalendarResources :
@deprecated use @deprecated use
addIncidence(Incidence *,ResourceCalendar *,const TQString &) instead. addIncidence(Incidence *,ResourceCalendar *,const TQString &) instead.
*/ */
KDE_DEPRECATED bool addTodo( Todo *todo, ResourceCalendar *resource ); TDE_DEPRECATED bool addTodo( Todo *todo, ResourceCalendar *resource );
/** /**
Insert an Todo into a Calendar Resource. Insert an Todo into a Calendar Resource.
@ -629,7 +629,7 @@ class LIBKCAL_EXPORT CalendarResources :
@deprecated use @deprecated use
addIncidence(Incidence *,ResourceCalendar *,const TQString &) instead. addIncidence(Incidence *,ResourceCalendar *,const TQString &) instead.
*/ */
KDE_DEPRECATED bool addJournal( Journal *journal, ResourceCalendar *resource ); TDE_DEPRECATED bool addJournal( Journal *journal, ResourceCalendar *resource );
/** /**
Insert a Journal into a Calendar Resource. Insert a Journal into a Calendar Resource.

@ -74,7 +74,7 @@ class LIBKCAL_EXPORT Event : public Incidence
settings. settings.
@deprecated use IncidenceFormatter::timeToString() @deprecated use IncidenceFormatter::timeToString()
*/ */
TQString KDE_DEPRECATED dtEndTimeStr() const; TQString TDE_DEPRECATED dtEndTimeStr() const;
/** /**
Return end date as string formatted according to the users locale Return end date as string formatted according to the users locale
settings. settings.
@ -83,13 +83,13 @@ class LIBKCAL_EXPORT Event : public Incidence
long format long format
@deprecated use IncidenceFormatter::dateToString() @deprecated use IncidenceFormatter::dateToString()
*/ */
TQString KDE_DEPRECATED dtEndDateStr( bool shortfmt = true ) const; TQString TDE_DEPRECATED dtEndDateStr( bool shortfmt = true ) const;
/** /**
Return end date and time as string formatted according to the users locale Return end date and time as string formatted according to the users locale
settings. settings.
@deprecated use IncidenceFormatter::dateTimeToString() @deprecated use IncidenceFormatter::dateTimeToString()
*/ */
TQString KDE_DEPRECATED dtEndStr() const; TQString TDE_DEPRECATED dtEndStr() const;
/** /**
Set whether the event has an end date/time. Set whether the event has an end date/time.

@ -139,20 +139,20 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties
users locale settings. users locale settings.
@deprecated use IncidenceFormatter::timeToString() @deprecated use IncidenceFormatter::timeToString()
*/ */
virtual KDE_DEPRECATED TQString dtStartTimeStr() const; virtual TDE_DEPRECATED TQString dtStartTimeStr() const;
/** /**
returns an event's starting date as a string formatted according to the returns an event's starting date as a string formatted according to the
users locale settings users locale settings
@deprecated use IncidenceFormatter::dateToString() @deprecated use IncidenceFormatter::dateToString()
*/ */
virtual KDE_DEPRECATED TQString dtStartDateStr( bool shortfmt = true ) const; virtual TDE_DEPRECATED TQString dtStartDateStr( bool shortfmt = true ) const;
/** /**
returns an event's starting date and time as a string formatted according returns an event's starting date and time as a string formatted according
to the users locale settings to the users locale settings
@deprecated use IncidenceFormatter::dateTimeToString() @deprecated use IncidenceFormatter::dateTimeToString()
*/ */
virtual KDE_DEPRECATED TQString dtStartStr() const; virtual TDE_DEPRECATED TQString dtStartStr() const;
virtual void setDuration( int seconds ); virtual void setDuration( int seconds );
int duration() const; int duration() const;

@ -52,20 +52,20 @@ class LIBKCAL_EXPORT InvitationFormatterHelper
class LIBKCAL_EXPORT IncidenceFormatter class LIBKCAL_EXPORT IncidenceFormatter
{ {
public: public:
static TQString KDE_DEPRECATED toolTipString( IncidenceBase *incidence, bool richText = true ); static TQString TDE_DEPRECATED toolTipString( IncidenceBase *incidence, bool richText = true );
static TQString toolTipStr( Calendar *calendar, static TQString toolTipStr( Calendar *calendar,
IncidenceBase *incidence, IncidenceBase *incidence,
const TQDate &date=TQDate(), const TQDate &date=TQDate(),
bool richText = true ); bool richText = true );
static TQString mailBodyString( IncidenceBase *incidencebase ); static TQString mailBodyString( IncidenceBase *incidencebase );
static TQString KDE_DEPRECATED extensiveDisplayString( IncidenceBase *incidence ); static TQString TDE_DEPRECATED extensiveDisplayString( IncidenceBase *incidence );
static TQString extensiveDisplayStr( Calendar *calendar, static TQString extensiveDisplayStr( Calendar *calendar,
IncidenceBase *incidence, IncidenceBase *incidence,
const TQDate &date=TQDate() ); const TQDate &date=TQDate() );
static TQString formatICalInvitation( TQString invitation, Calendar *mCalendar, static TQString formatICalInvitation( TQString invitation, Calendar *mCalendar,
InvitationFormatterHelper *helper ); InvitationFormatterHelper *helper );
static TQString KDE_DEPRECATED formatICalInvitationNoHtml( TQString invitation, static TQString TDE_DEPRECATED formatICalInvitationNoHtml( TQString invitation,
Calendar *mCalendar, Calendar *mCalendar,
InvitationFormatterHelper *helper ); InvitationFormatterHelper *helper );
static TQString formatICalInvitationNoHtml( TQString invitation, static TQString formatICalInvitationNoHtml( TQString invitation,

@ -137,7 +137,7 @@ class TDE_EXPORT ResourceCached : public ResourceCalendar,
/** /**
Add event to calendar. Add event to calendar.
*/ */
KDE_DEPRECATED bool addEvent( Event *event ); TDE_DEPRECATED bool addEvent( Event *event );
bool addEvent( Event *event, const TQString &subresource ); bool addEvent( Event *event, const TQString &subresource );
/** /**
@ -177,7 +177,7 @@ class TDE_EXPORT ResourceCached : public ResourceCalendar,
/** /**
Add a todo to the todolist. Add a todo to the todolist.
*/ */
KDE_DEPRECATED bool addTodo( Todo *todo ); TDE_DEPRECATED bool addTodo( Todo *todo );
bool addTodo( Todo *todo, const TQString &subresource ); bool addTodo( Todo *todo, const TQString &subresource );
/** /**
@ -200,7 +200,7 @@ class TDE_EXPORT ResourceCached : public ResourceCalendar,
/** /**
Add a Journal entry to calendar Add a Journal entry to calendar
*/ */
KDE_DEPRECATED bool addJournal( Journal *journal ); TDE_DEPRECATED bool addJournal( Journal *journal );
bool addJournal( Journal *journal, const TQString &subresource ); bool addJournal( Journal *journal, const TQString &subresource );
/** /**

@ -144,7 +144,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
Add incidence to resource. Add incidence to resource.
@deprecated use addIncidence(Incidence *,const TQString &) instead. @deprecated use addIncidence(Incidence *,const TQString &) instead.
*/ */
virtual KDE_DEPRECATED bool addIncidence( Incidence * ); virtual TDE_DEPRECATED bool addIncidence( Incidence * );
/** /**
Add incidence to resource and subresource. Add incidence to resource and subresource.
@ -166,7 +166,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
Add event to resource. Add event to resource.
@deprecated use addEvent(Event *,const TQString&) instead. @deprecated use addEvent(Event *,const TQString&) instead.
*/ */
virtual KDE_DEPRECATED bool addEvent( Event *event ) = 0; virtual TDE_DEPRECATED bool addEvent( Event *event ) = 0;
virtual bool addEvent( Event *event, const TQString &subresource ) = 0; virtual bool addEvent( Event *event, const TQString &subresource ) = 0;
/** /**
@ -270,7 +270,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
Add a todo to the todolist. Add a todo to the todolist.
@deprecated use addTodo(Todo *,const TQString &) instead. @deprecated use addTodo(Todo *,const TQString &) instead.
*/ */
virtual KDE_DEPRECATED bool addTodo( Todo *todo ) = 0; virtual TDE_DEPRECATED bool addTodo( Todo *todo ) = 0;
virtual bool addTodo( Todo *todo, const TQString &subresource ) = 0; virtual bool addTodo( Todo *todo, const TQString &subresource ) = 0;
/** /**
@ -297,7 +297,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
Add a Journal entry to the resource. Add a Journal entry to the resource.
@deprecated use addJournal(Journal *,const TQString &) instead. @deprecated use addJournal(Journal *,const TQString &) instead.
*/ */
virtual KDE_DEPRECATED bool addJournal( Journal * ) = 0; virtual TDE_DEPRECATED bool addJournal( Journal * ) = 0;
virtual bool addJournal( Journal *journal, const TQString &subresource ) = 0; virtual bool addJournal( Journal *journal, const TQString &subresource ) = 0;
/** /**

@ -174,7 +174,7 @@ class LIBKCAL_EXPORT Scheduler
bool acceptRequest( IncidenceBase *, ScheduleMessage::Status status, bool acceptRequest( IncidenceBase *, ScheduleMessage::Status status,
const TQString & attendee ); const TQString & attendee );
bool acceptAdd( IncidenceBase *, ScheduleMessage::Status status ); bool acceptAdd( IncidenceBase *, ScheduleMessage::Status status );
KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status ); TDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status );
bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status, bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status,
const TQString & attendee ); const TQString & attendee );
bool acceptDeclineCounter( IncidenceBase *, bool acceptDeclineCounter( IncidenceBase *,

@ -68,7 +68,7 @@ class LIBKCAL_EXPORT Todo : public Incidence
settings. settings.
@deprecated use IncidenceFormatter::timeToString() @deprecated use IncidenceFormatter::timeToString()
*/ */
KDE_DEPRECATED TQString dtDueTimeStr() const; TDE_DEPRECATED TQString dtDueTimeStr() const;
/** /**
Returns due date as string formatted according to the users locale Returns due date as string formatted according to the users locale
@ -78,14 +78,14 @@ class LIBKCAL_EXPORT Todo : public Incidence
long format. long format.
@deprecated use IncidenceFormatter::dateToString() @deprecated use IncidenceFormatter::dateToString()
*/ */
KDE_DEPRECATED TQString dtDueDateStr( bool shortfmt = true ) const; TDE_DEPRECATED TQString dtDueDateStr( bool shortfmt = true ) const;
/** /**
Returns due date and time as string formatted according to the users locale Returns due date and time as string formatted according to the users locale
settings. settings.
@deprecated use IncidenceFormatter::dateTimeToString() @deprecated use IncidenceFormatter::dateTimeToString()
*/ */
KDE_DEPRECATED TQString dtDueStr() const; TDE_DEPRECATED TQString dtDueStr() const;
/** /**
Returns true if the todo has a due date, otherwise return false. Returns true if the todo has a due date, otherwise return false.

@ -63,11 +63,11 @@ class TDE_EXPORT KHolidays {
TQValueList<KHoliday> getHolidays( const TQDate& ); TQValueList<KHoliday> getHolidays( const TQDate& );
KDE_DEPRECATED TQString shortText( const TQDate& ); TDE_DEPRECATED TQString shortText( const TQDate& );
KDE_DEPRECATED TQString getHoliday( const TQDate& ); TDE_DEPRECATED TQString getHoliday( const TQDate& );
enum { WORKDAY, HOLIDAY }; enum { WORKDAY, HOLIDAY };
KDE_DEPRECATED int category( const TQDate& ); TDE_DEPRECATED int category( const TQDate& );
private: private:
bool parseFile( const TQDate& ); bool parseFile( const TQDate& );

@ -186,8 +186,8 @@ public:
TQString organization() const { return mOrganization; } TQString organization() const { return mOrganization; }
void setOrganization(const TQString&); void setOrganization(const TQString&);
KDE_DEPRECATED TQCString pgpIdentity() const { return pgpEncryptionKey(); } TDE_DEPRECATED TQCString pgpIdentity() const { return pgpEncryptionKey(); }
KDE_DEPRECATED void setPgpIdentity( const TQCString & key ) { TDE_DEPRECATED void setPgpIdentity( const TQCString & key ) {
setPGPEncryptionKey( key ); setPGPEncryptionKey( key );
setPGPSigningKey( key ); setPGPSigningKey( key );
} }
@ -212,8 +212,8 @@ public:
void setPreferredCryptoMessageFormat( Kleo::CryptoMessageFormat format ) { mPreferredCryptoMessageFormat = format; } void setPreferredCryptoMessageFormat( Kleo::CryptoMessageFormat format ) { mPreferredCryptoMessageFormat = format; }
/** email address (without the user name - only name\@host) */ /** email address (without the user name - only name\@host) */
KDE_DEPRECATED TQString emailAddr() const { return primaryEmailAddress(); } TDE_DEPRECATED TQString emailAddr() const { return primaryEmailAddress(); }
KDE_DEPRECATED void setEmailAddr( const TQString & email ) { setPrimaryEmailAddress( email ); } TDE_DEPRECATED void setEmailAddr( const TQString & email ) { setPrimaryEmailAddress( email ); }
/** primary email address (without the user name - only name\@host). /** primary email address (without the user name - only name\@host).
The primary email address is used for all outgoing mail. */ The primary email address is used for all outgoing mail. */

@ -77,7 +77,7 @@ class TDE_EXPORT ResourceTDEABC : public ResourceCalendar
TDEABC::Lock *lock(); TDEABC::Lock *lock();
/** Add Event to calendar. */ /** Add Event to calendar. */
KDE_DEPRECATED bool addEvent(Event *event); TDE_DEPRECATED bool addEvent(Event *event);
bool addEvent( Event *event, const TQString &subresource ); bool addEvent( Event *event, const TQString &subresource );
/** deletes an event from this calendar. */ /** deletes an event from this calendar. */
bool deleteEvent(Event *); bool deleteEvent(Event *);
@ -109,7 +109,7 @@ class TDE_EXPORT ResourceTDEABC : public ResourceCalendar
/** /**
Add a todo to the todolist. Add a todo to the todolist.
*/ */
KDE_DEPRECATED bool addTodo( Todo *todo ); TDE_DEPRECATED bool addTodo( Todo *todo );
bool addTodo( Todo *todo, const TQString &subresource ); bool addTodo( Todo *todo, const TQString &subresource );
/** /**
Remove a todo from the todolist. Remove a todo from the todolist.
@ -129,7 +129,7 @@ class TDE_EXPORT ResourceTDEABC : public ResourceCalendar
*/ */
Todo::List rawTodosForDate( const TQDate &date ); Todo::List rawTodosForDate( const TQDate &date );
/** Add a Journal entry to calendar */ /** Add a Journal entry to calendar */
KDE_DEPRECATED bool addJournal( Journal *journal ); TDE_DEPRECATED bool addJournal( Journal *journal );
bool addJournal( Journal *journal, const TQString &subresource ); bool addJournal( Journal *journal, const TQString &subresource );
/** Remove journal from the calendar. */ /** Remove journal from the calendar. */

@ -84,7 +84,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
// void close(); // void close();
/** Add Event to calendar. */ /** Add Event to calendar. */
KDE_DEPRECATED bool addEvent( Event *event ); TDE_DEPRECATED bool addEvent( Event *event );
bool addEvent( Event *event, const TQString &subresource ); bool addEvent( Event *event, const TQString &subresource );
/** deletes an event from this calendar. */ /** deletes an event from this calendar. */
@ -121,7 +121,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
/** /**
Add a todo to the todolist. Add a todo to the todolist.
*/ */
KDE_DEPRECATED bool addTodo( Todo *todo ); TDE_DEPRECATED bool addTodo( Todo *todo );
bool addTodo( Todo *todo, const TQString &subresource ); bool addTodo( Todo *todo, const TQString &subresource );
/** /**
Remove a todo from the todolist. Remove a todo from the todolist.
@ -142,7 +142,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
Todo::List rawTodosForDate( const TQDate &date ); Todo::List rawTodosForDate( const TQDate &date );
/** Add a Journal entry to calendar */ /** Add a Journal entry to calendar */
KDE_DEPRECATED bool addJournal( Journal *journal ); TDE_DEPRECATED bool addJournal( Journal *journal );
bool addJournal( Journal *journal, const TQString &subresource ); bool addJournal( Journal *journal, const TQString &subresource );
/** deletes an event from this calendar. */ /** deletes an event from this calendar. */
virtual bool deleteJournal(Journal *); virtual bool deleteJournal(Journal *);

@ -71,7 +71,7 @@ public:
void doClose(); void doClose();
// The libkcal functions. See the resource for descriptions // 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 addEvent( KCal::Event *event, const TQString &subResource );
bool deleteEvent( KCal::Event * ); bool deleteEvent( KCal::Event * );
KCal::Event* event( const TQString &UniqueStr ); KCal::Event* event( const TQString &UniqueStr );
@ -84,14 +84,14 @@ public:
KCal::Event::List rawEvents( const TQDate& start, const TQDate& end, KCal::Event::List rawEvents( const TQDate& start, const TQDate& end,
bool inclusive = false ); 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 addTodo( KCal::Todo *todo, const TQString &subResource );
bool deleteTodo( KCal::Todo * ); bool deleteTodo( KCal::Todo * );
KCal::Todo* todo( const TQString &uid ); KCal::Todo* todo( const TQString &uid );
KCal::Todo::List rawTodos( TodoSortField sortField = TodoSortUnsorted, SortDirection sortDirection = SortDirectionAscending ); KCal::Todo::List rawTodos( TodoSortField sortField = TodoSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
KCal::Todo::List rawTodosForDate( const TQDate& date ); 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 addJournal( KCal::Journal *, const TQString &subResource );
bool deleteJournal( KCal::Journal * ); bool deleteJournal( KCal::Journal * );
KCal::Journal* journal( const TQString &uid ); KCal::Journal* journal( const TQString &uid );

Loading…
Cancel
Save