diff options
Diffstat (limited to 'libkcal')
33 files changed, 88 insertions, 97 deletions
diff --git a/libkcal/attachment.h b/libkcal/attachment.h index 9d36274c..8377836e 100644 --- a/libkcal/attachment.h +++ b/libkcal/attachment.h @@ -31,7 +31,7 @@ namespace KCal { /** This class represents information related to an attachment. */ -class KDE_EXPORT Attachment +class TDE_EXPORT Attachment { public: typedef ListBase<Attachment> List; diff --git a/libkcal/calendar.h b/libkcal/calendar.h index eeccff92..2c76832e 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h @@ -169,7 +169,7 @@ enum JournalSortField class LIBKCAL_EXPORT Calendar : public TQObject, public CustomProperties, public IncidenceBase::Observer { - Q_OBJECT + TQ_OBJECT public: diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp index bfc493ba..2787a89c 100644 --- a/libkcal/calendarresources.cpp +++ b/libkcal/calendarresources.cpp @@ -131,8 +131,8 @@ void CalendarResources::init( const TQString &family ) mDestinationPolicy = mStandardPolicy; mPendingDeleteFromResourceMap = false; - connect( this, TQT_SIGNAL(batchAddingBegins()), this, TQT_SLOT(beginAddingIncidences()) ); - connect( this, TQT_SIGNAL(batchAddingEnds()), this, TQT_SLOT(endAddingIncidences()) ); + connect( this, TQ_SIGNAL(batchAddingBegins()), this, TQ_SLOT(beginAddingIncidences()) ); + connect( this, TQ_SIGNAL(batchAddingEnds()), this, TQ_SLOT(endAddingIncidences()) ); } CalendarResources::~CalendarResources() @@ -756,17 +756,17 @@ Journal::List CalendarResources::rawJournalsForDate( const TQDate &date ) void CalendarResources::connectResource( ResourceCalendar *resource ) { - connect( resource, TQT_SIGNAL( resourceChanged( ResourceCalendar * ) ), - TQT_SIGNAL( calendarChanged() ) ); - connect( resource, TQT_SIGNAL( resourceSaved( ResourceCalendar * ) ), - TQT_SIGNAL( calendarSaved() ) ); + connect( resource, TQ_SIGNAL( resourceChanged( ResourceCalendar * ) ), + TQ_SIGNAL( calendarChanged() ) ); + connect( resource, TQ_SIGNAL( resourceSaved( ResourceCalendar * ) ), + TQ_SIGNAL( calendarSaved() ) ); - connect( resource, TQT_SIGNAL( resourceLoadError( ResourceCalendar *, + connect( resource, TQ_SIGNAL( resourceLoadError( ResourceCalendar *, const TQString & ) ), - TQT_SLOT( slotLoadError( ResourceCalendar *, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( resourceSaveError( ResourceCalendar *, + TQ_SLOT( slotLoadError( ResourceCalendar *, const TQString & ) ) ); + connect( resource, TQ_SIGNAL( resourceSaveError( ResourceCalendar *, const TQString & ) ), - TQT_SLOT( slotSaveError( ResourceCalendar *, const TQString & ) ) ); + TQ_SLOT( slotSaveError( ResourceCalendar *, const TQString & ) ) ); } ResourceCalendar *CalendarResources::resource( Incidence *incidence ) diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h index bb756f85..23539fc3 100644 --- a/libkcal/calendarresources.h +++ b/libkcal/calendarresources.h @@ -65,7 +65,7 @@ class LIBKCAL_EXPORT CalendarResources : public Calendar, public KRES::ManagerObserver<ResourceCalendar> { - Q_OBJECT + TQ_OBJECT public: /** @@ -340,7 +340,7 @@ class LIBKCAL_EXPORT CalendarResources : @deprecated use 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. @@ -362,7 +362,7 @@ class LIBKCAL_EXPORT CalendarResources : @return false if the resource could not be computed or if a ticket 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. @@ -385,7 +385,7 @@ class LIBKCAL_EXPORT CalendarResources : @return false if the resource could not be computed or if a ticket 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. @@ -427,7 +427,7 @@ class LIBKCAL_EXPORT CalendarResources : @deprecated use 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. @@ -544,7 +544,7 @@ class LIBKCAL_EXPORT CalendarResources : @deprecated use 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. @@ -629,7 +629,7 @@ class LIBKCAL_EXPORT CalendarResources : @deprecated use 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. diff --git a/libkcal/calhelper.cpp b/libkcal/calhelper.cpp index 89a67fb3..b7816675 100644 --- a/libkcal/calhelper.cpp +++ b/libkcal/calhelper.cpp @@ -162,6 +162,6 @@ TQPair<ResourceCalendar *, TQString> CalHelper::incSubResourceCalendar( Calendar if ( res && res->canHaveSubresources() ) { subRes = res->subresourceIdentifier( incidence ); } - p = tqMakePair( res, subRes ); + p = qMakePair( res, subRes ); return p; } diff --git a/libkcal/calselectdialog.cpp b/libkcal/calselectdialog.cpp index b72a1627..c2a7f897 100644 --- a/libkcal/calselectdialog.cpp +++ b/libkcal/calselectdialog.cpp @@ -65,10 +65,10 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label mListBox->ensureCurrentVisible(); layout->addWidget( mListBox, 10 ); - connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), - TQT_SLOT(slotOk()) ); - connect( mListBox, TQT_SIGNAL(returnPressed(TQListBoxItem *)), - TQT_SLOT(slotOk()) ); + connect( mListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), + TQ_SLOT(slotOk()) ); + connect( mListBox, TQ_SIGNAL(returnPressed(TQListBoxItem *)), + TQ_SLOT(slotOk()) ); mListBox->setFocus(); diff --git a/libkcal/confirmsavedialog.h b/libkcal/confirmsavedialog.h index bc0fcb09..313dd273 100644 --- a/libkcal/confirmsavedialog.h +++ b/libkcal/confirmsavedialog.h @@ -29,7 +29,7 @@ class TDEListView; namespace KCal { -class KDE_EXPORT ConfirmSaveDialog : public KDialogBase +class TDE_EXPORT ConfirmSaveDialog : public KDialogBase { public: ConfirmSaveDialog( const TQString &destination, TQWidget *parent, diff --git a/libkcal/event.h b/libkcal/event.h index ba0780fb..707453ae 100644 --- a/libkcal/event.h +++ b/libkcal/event.h @@ -74,7 +74,7 @@ class LIBKCAL_EXPORT Event : public Incidence settings. @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 settings. @@ -83,13 +83,13 @@ class LIBKCAL_EXPORT Event : public Incidence long format @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 settings. @deprecated use IncidenceFormatter::dateTimeToString() */ - TQString KDE_DEPRECATED dtEndStr() const; + TQString TDE_DEPRECATED dtEndStr() const; /** Set whether the event has an end date/time. diff --git a/libkcal/htmlexport.h b/libkcal/htmlexport.h index 0fbe8022..bcf5af96 100644 --- a/libkcal/htmlexport.h +++ b/libkcal/htmlexport.h @@ -39,7 +39,7 @@ namespace KCal { /** This class provides the functions to export a calendar as an HTML page. */ -class KDE_EXPORT HtmlExport +class TDE_EXPORT HtmlExport { public: /** diff --git a/libkcal/htmlexportsettings.kcfgc b/libkcal/htmlexportsettings.kcfgc index db2360aa..e756d7e2 100644 --- a/libkcal/htmlexportsettings.kcfgc +++ b/libkcal/htmlexportsettings.kcfgc @@ -7,4 +7,4 @@ MemberVariables=public GlobalEnums=true ItemAccessors=true SetUserTexts=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index e4296bce..d8fe62df 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp @@ -69,15 +69,6 @@ static void _dumpIcaltime( const icaltimetype& t) } */ -static TQString quoteForParam( const TQString &text ) -{ - TQString tmp = text; - tmp.remove( '"' ); - if ( tmp.contains( ';' ) || tmp.contains( ':' ) || tmp.contains( ',' ) ) - return tmp; // libical quotes in this case already, see icalparameter_as_ical_string() - return TQString::fromLatin1( "\"" ) + tmp + TQString::fromLatin1( "\"" ); -} - const int gSecondsPerMinute = 60; const int gSecondsPerHour = gSecondsPerMinute * 60; const int gSecondsPerDay = gSecondsPerHour * 24; @@ -576,7 +567,7 @@ icalproperty *ICalFormatImpl::writeOrganizer( const Person &organizer ) icalproperty *p = icalproperty_new_organizer("MAILTO:" + organizer.email().utf8()); if (!organizer.name().isEmpty()) { - icalproperty_add_parameter( p, icalparameter_new_cn(quoteForParam(organizer.name()).utf8()) ); + icalproperty_add_parameter( p, icalparameter_new_cn(organizer.name().utf8()) ); } // TODO: Write dir, sent-by and language @@ -589,7 +580,7 @@ icalproperty *ICalFormatImpl::writeAttendee(Attendee *attendee) icalproperty *p = icalproperty_new_attendee("mailto:" + attendee->email().utf8()); if (!attendee->name().isEmpty()) { - icalproperty_add_parameter(p,icalparameter_new_cn(quoteForParam(attendee->name()).utf8())); + icalproperty_add_parameter(p,icalparameter_new_cn(attendee->name().utf8())); } @@ -869,7 +860,7 @@ icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm) for (TQValueList<Person>::Iterator ad = addresses.begin(); ad != addresses.end(); ++ad) { icalproperty *p = icalproperty_new_attendee("MAILTO:" + (*ad).email().utf8()); if (!(*ad).name().isEmpty()) { - icalproperty_add_parameter(p,icalparameter_new_cn(quoteForParam((*ad).name()).utf8())); + icalproperty_add_parameter(p,icalparameter_new_cn((*ad).name().utf8())); } icalcomponent_add_property(a,p); } diff --git a/libkcal/imipscheduler.h b/libkcal/imipscheduler.h index 59379403..698ef0b5 100644 --- a/libkcal/imipscheduler.h +++ b/libkcal/imipscheduler.h @@ -34,7 +34,7 @@ namespace KCal { This class implements the iTIP interface using the email interface specified as iMIP. */ -class KDE_EXPORT IMIPScheduler : public Scheduler +class TDE_EXPORT IMIPScheduler : public Scheduler { public: IMIPScheduler( Calendar * ); diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index d54ca879..10a9ab20 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h @@ -139,20 +139,20 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties users locale settings. @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 users locale settings @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 to the users locale settings @deprecated use IncidenceFormatter::dateTimeToString() */ - virtual KDE_DEPRECATED TQString dtStartStr() const; + virtual TDE_DEPRECATED TQString dtStartStr() const; virtual void setDuration( int seconds ); int duration() const; diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index da3a7aae..785a681b 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -2837,7 +2837,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) ICalFormat calFormat; Event* event = new Event(); - if( parser.openDevice( &TQT_TQIODEVICE_OBJECT(buf) ) ) { + if( parser.openDevice( &buf ) ) { KTNEFMessage* tnefMsg = parser.message(); //TQMap<int,KTNEFProperty*> props = parser.message()->properties(); diff --git a/libkcal/incidenceformatter.h b/libkcal/incidenceformatter.h index b2dcd432..9d6e8a75 100644 --- a/libkcal/incidenceformatter.h +++ b/libkcal/incidenceformatter.h @@ -52,20 +52,20 @@ class LIBKCAL_EXPORT InvitationFormatterHelper class LIBKCAL_EXPORT IncidenceFormatter { 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, IncidenceBase *incidence, const TQDate &date=TQDate(), bool richText = true ); static TQString mailBodyString( IncidenceBase *incidencebase ); - static TQString KDE_DEPRECATED extensiveDisplayString( IncidenceBase *incidence ); + static TQString TDE_DEPRECATED extensiveDisplayString( IncidenceBase *incidence ); static TQString extensiveDisplayStr( Calendar *calendar, IncidenceBase *incidence, const TQDate &date=TQDate() ); static TQString formatICalInvitation( TQString invitation, Calendar *mCalendar, InvitationFormatterHelper *helper ); - static TQString KDE_DEPRECATED formatICalInvitationNoHtml( TQString invitation, + static TQString TDE_DEPRECATED formatICalInvitationNoHtml( TQString invitation, Calendar *mCalendar, InvitationFormatterHelper *helper ); static TQString formatICalInvitationNoHtml( TQString invitation, diff --git a/libkcal/libkcal_export.h b/libkcal/libkcal_export.h index 7fca2dbe..19502ff1 100644 --- a/libkcal/libkcal_export.h +++ b/libkcal/libkcal_export.h @@ -23,6 +23,6 @@ #include <kdemacros.h> -#define LIBKCAL_EXPORT KDE_EXPORT +#define LIBKCAL_EXPORT TDE_EXPORT #endif diff --git a/libkcal/period.h b/libkcal/period.h index b0ca32a3..64250a43 100644 --- a/libkcal/period.h +++ b/libkcal/period.h @@ -32,7 +32,7 @@ namespace KCal { This class represents a period of time. The period can be defined by either a start time and an end time or by a start time and a duration. */ -class KDE_EXPORT Period +class TDE_EXPORT Period { public: Period(); diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index 38110431..dcd161ce 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -55,8 +55,8 @@ ResourceCached::ResourceCached( const TDEConfig* config ) mSavePolicy( SaveNever ), mSaveInterval( 10 ), mSaveTimer( 0, "mSaveTimer" ), mIdMapper( "kcal/uidmaps/" ) { - connect( &mReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotReload() ) ); - connect( &mSaveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSave() ) ); + connect( &mReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotReload() ) ); + connect( &mSaveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSave() ) ); } ResourceCached::~ResourceCached() diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h index f890d265..6465def9 100644 --- a/libkcal/resourcecached.h +++ b/libkcal/resourcecached.h @@ -42,10 +42,10 @@ namespace KCal { This class provides a calendar resource using a local CalendarLocal object to cache the calendar data. */ -class KDE_EXPORT ResourceCached : public ResourceCalendar, +class TDE_EXPORT ResourceCached : public ResourceCalendar, public KCal::Calendar::Observer { - Q_OBJECT + TQ_OBJECT public: /** @@ -137,7 +137,7 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar, /** Add event to calendar. */ - KDE_DEPRECATED bool addEvent( Event *event ); + TDE_DEPRECATED bool addEvent( Event *event ); bool addEvent( Event *event, const TQString &subresource ); /** @@ -177,7 +177,7 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar, /** 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 ); /** @@ -200,7 +200,7 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar, /** 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 ); /** diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp index ee43f711..6d6ada34 100644 --- a/libkcal/resourcecachedconfig.cpp +++ b/libkcal/resourcecachedconfig.cpp @@ -41,15 +41,15 @@ ResourceCachedReloadConfig::ResourceCachedReloadConfig( TQWidget *parent, { TQBoxLayout *topLayout = new TQVBoxLayout( this ); - mGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Automatic Reload"), this ); + mGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Automatic Reload"), this ); topLayout->addWidget( mGroup ); new TQRadioButton( i18n("Never"), mGroup ); new TQRadioButton( i18n("On startup"), mGroup ); TQRadioButton *intervalRadio = new TQRadioButton( i18n("Regular interval"), mGroup ); - connect( intervalRadio, TQT_SIGNAL( stateChanged( int ) ), - TQT_SLOT( slotIntervalStateChanged( int ) ) ); + connect( intervalRadio, TQ_SIGNAL( stateChanged( int ) ), + TQ_SLOT( slotIntervalStateChanged( int ) ) ); TQHBox *intervalBox = new TQHBox( mGroup ); new TQLabel( i18n("Interval in minutes"), intervalBox ); mIntervalSpin = new TQSpinBox( 1,900, 1,intervalBox ); @@ -81,15 +81,15 @@ ResourceCachedSaveConfig::ResourceCachedSaveConfig( TQWidget *parent, { TQBoxLayout *topLayout = new TQVBoxLayout( this ); - mGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Automatic Save"), this ); + mGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Automatic Save"), this ); topLayout->addWidget( mGroup ); new TQRadioButton( i18n("Never"), mGroup ); new TQRadioButton( i18n("On exit"), mGroup ); TQRadioButton *intervalRadio = new TQRadioButton( i18n("Regular interval"), mGroup ); - connect( intervalRadio, TQT_SIGNAL( stateChanged( int ) ), - TQT_SLOT( slotIntervalStateChanged( int ) ) ); + connect( intervalRadio, TQ_SIGNAL( stateChanged( int ) ), + TQ_SLOT( slotIntervalStateChanged( int ) ) ); TQHBox *intervalBox = new TQHBox( mGroup ); new TQLabel( i18n("Interval in minutes"), intervalBox ); mIntervalSpin = new TQSpinBox( 1,900, 1,intervalBox ); diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h index de63c2b6..ff3639c1 100644 --- a/libkcal/resourcecachedconfig.h +++ b/libkcal/resourcecachedconfig.h @@ -36,9 +36,9 @@ class ResourceCached; @see ResourceCached */ -class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget +class TDE_EXPORT ResourceCachedReloadConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ResourceCachedReloadConfig( TQWidget *parent = 0, const char *name = 0 ); @@ -63,9 +63,9 @@ class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget @see ResourceCached */ -class KDE_EXPORT ResourceCachedSaveConfig : public TQWidget +class TDE_EXPORT ResourceCachedSaveConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ResourceCachedSaveConfig( TQWidget *parent = 0, const char *name = 0 ); diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index ebb6a8b9..84530421 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -56,7 +56,7 @@ class CalFormat; */ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource { - Q_OBJECT + TQ_OBJECT public: ResourceCalendar( const TDEConfig * ); @@ -144,7 +144,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource Add incidence to resource. @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. @@ -166,7 +166,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource Add event to resource. @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; /** @@ -270,7 +270,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource Add a todo to the todolist. @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; /** @@ -297,7 +297,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource Add a Journal entry to the resource. @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; /** diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp index a193b0b7..7651daf5 100644 --- a/libkcal/resourcelocal.cpp +++ b/libkcal/resourcelocal.cpp @@ -111,12 +111,12 @@ void ResourceLocal::init() setSavePolicy( SaveDelayed ); - connect( &mDirWatch, TQT_SIGNAL( dirty( const TQString & ) ), - TQT_SLOT( reload() ) ); - connect( &mDirWatch, TQT_SIGNAL( created( const TQString & ) ), - TQT_SLOT( reload() ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ), - TQT_SLOT( reload() ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty( const TQString & ) ), + TQ_SLOT( reload() ) ); + connect( &mDirWatch, TQ_SIGNAL( created( const TQString & ) ), + TQ_SLOT( reload() ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted( const TQString & ) ), + TQ_SLOT( reload() ) ); mLock = new TDEABC::Lock( mURL.path() ); diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h index 5b47d5ea..1ef4cf01 100644 --- a/libkcal/resourcelocal.h +++ b/libkcal/resourcelocal.h @@ -44,7 +44,7 @@ class CalFormat; */ class LIBKCAL_EXPORT ResourceLocal : public ResourceCached { - Q_OBJECT + TQ_OBJECT friend class ResourceLocalConfig; diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp index ccba0328..0999aaae 100644 --- a/libkcal/resourcelocalconfig.cpp +++ b/libkcal/resourcelocalconfig.cpp @@ -51,7 +51,7 @@ ResourceLocalConfig::ResourceLocalConfig( TQWidget* parent, const char* name ) mainLayout->addWidget( label, 1, 0 ); mainLayout->addWidget( mURL, 1, 1 ); - formatGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Calendar Format" ), this ); + formatGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Calendar Format" ), this ); icalButton = new TQRadioButton( i18n("iCalendar"), formatGroup ); vcalButton = new TQRadioButton( i18n("vCalendar"), formatGroup ); diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h index d8b0c6c1..2bb732ee 100644 --- a/libkcal/resourcelocalconfig.h +++ b/libkcal/resourcelocalconfig.h @@ -41,7 +41,7 @@ namespace KCal { */ class LIBKCAL_EXPORT ResourceLocalConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceLocalConfig( TQWidget* parent = 0, const char* name = 0 ); diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp index 33fa42f7..0c22cae5 100644 --- a/libkcal/resourcelocaldir.cpp +++ b/libkcal/resourcelocaldir.cpp @@ -92,12 +92,12 @@ void ResourceLocalDir::init() setSavePolicy( SaveDelayed ); - connect( &mDirWatch, TQT_SIGNAL( dirty( const TQString & ) ), - TQT_SLOT( reload( const TQString & ) ) ); - connect( &mDirWatch, TQT_SIGNAL( created( const TQString & ) ), - TQT_SLOT( reload( const TQString & ) ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ), - TQT_SLOT( reload( const TQString & ) ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty( const TQString & ) ), + TQ_SLOT( reload( const TQString & ) ) ); + connect( &mDirWatch, TQ_SIGNAL( created( const TQString & ) ), + TQ_SLOT( reload( const TQString & ) ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted( const TQString & ) ), + TQ_SLOT( reload( const TQString & ) ) ); mLock = new TDEABC::Lock( mURL.path() ); diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h index 2f1bbec3..de7d35b2 100644 --- a/libkcal/resourcelocaldir.h +++ b/libkcal/resourcelocaldir.h @@ -44,7 +44,7 @@ class Incidence; */ class LIBKCAL_EXPORT ResourceLocalDir : public ResourceCached { - Q_OBJECT + TQ_OBJECT friend class ResourceLocalDirConfig; diff --git a/libkcal/resourcelocaldirconfig.h b/libkcal/resourcelocaldirconfig.h index 46994ef4..a6538acd 100644 --- a/libkcal/resourcelocaldirconfig.h +++ b/libkcal/resourcelocaldirconfig.h @@ -43,7 +43,7 @@ namespace KCal { */ class LIBKCAL_EXPORT ResourceLocalDirConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceLocalDirConfig( TQWidget *parent = 0, const char *name = 0 ); diff --git a/libkcal/scheduler.h b/libkcal/scheduler.h index 4d97ab51..fe6c430a 100644 --- a/libkcal/scheduler.h +++ b/libkcal/scheduler.h @@ -174,7 +174,7 @@ class LIBKCAL_EXPORT Scheduler bool acceptRequest( IncidenceBase *, ScheduleMessage::Status status, const TQString & attendee ); 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, const TQString & attendee ); bool acceptDeclineCounter( IncidenceBase *, diff --git a/libkcal/tests/testresource.h b/libkcal/tests/testresource.h index 4d17c7b4..8e5cb04c 100644 --- a/libkcal/tests/testresource.h +++ b/libkcal/tests/testresource.h @@ -28,7 +28,7 @@ namespace KCal { class TestResource : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libkcal/todo.h b/libkcal/todo.h index 74e1b39d..25e63045 100644 --- a/libkcal/todo.h +++ b/libkcal/todo.h @@ -68,7 +68,7 @@ class LIBKCAL_EXPORT Todo : public Incidence settings. @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 @@ -78,14 +78,14 @@ class LIBKCAL_EXPORT Todo : public Incidence long format. @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 settings. @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. diff --git a/libkcal/vcaldrag.h b/libkcal/vcaldrag.h index 7cb8c6bb..7cfbff52 100644 --- a/libkcal/vcaldrag.h +++ b/libkcal/vcaldrag.h @@ -32,7 +32,7 @@ class Calendar; /** vCalendar drag&drop class. */ -class KDE_EXPORT VCalDrag : public TQStoredDrag +class TDE_EXPORT VCalDrag : public TQStoredDrag { public: /** |