diff options
Diffstat (limited to 'libkcal')
58 files changed, 163 insertions, 304 deletions
diff --git a/libkcal/CMakeL10n.txt b/libkcal/CMakeL10n.txt index 0534db65..bc378c82 100644 --- a/libkcal/CMakeL10n.txt +++ b/libkcal/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_create_template( "libkcal" ) + +tde_l10n_create_template( + CATALOG "desktop_files/libkcal-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/libkcal/CMakeLists.txt b/libkcal/CMakeLists.txt index dbded2cb..a232a8b7 100644 --- a/libkcal/CMakeLists.txt +++ b/libkcal/CMakeLists.txt @@ -55,8 +55,17 @@ install( FILES ##### other data ################################ -install( FILES local.desktop localdir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) -install( FILES kcal_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources ) +tde_create_translated_desktop( + SOURCE local.desktop localdir.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal + PO_DIR libkcal-desktops +) + +tde_create_translated_desktop( + SOURCE kcal_manager.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources + PO_DIR libkcal-desktops +) ##### kcal_local (module) ####################### diff --git a/libkcal/alarm.h b/libkcal/alarm.h index 09de14f0..ec927005 100644 --- a/libkcal/alarm.h +++ b/libkcal/alarm.h @@ -33,7 +33,7 @@ #include "listbase.h" #include "libkcal_export.h" -#include <tdepimmacros.h> +#include <tdemacros.h> namespace KCal { diff --git a/libkcal/assignmentvisitor.cpp b/libkcal/assignmentvisitor.cpp index 023df857..c5599e93 100644 --- a/libkcal/assignmentvisitor.cpp +++ b/libkcal/assignmentvisitor.cpp @@ -119,5 +119,3 @@ bool AssignmentVisitor::visit( FreeBusy *freebusy ) *freebusy = *source; return true; } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/libkcal/assignmentvisitor.h b/libkcal/assignmentvisitor.h index 2be0215c..12d6daac 100644 --- a/libkcal/assignmentvisitor.h +++ b/libkcal/assignmentvisitor.h @@ -119,4 +119,3 @@ class AssignmentVisitor : public IncidenceBase::Visitor } #endif -// kate: space-indent on; indent-width 2; replace-tabs on; 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/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp index 0d1c63f2..5f027a3c 100644 --- a/libkcal/attachmenthandler.cpp +++ b/libkcal/attachmenthandler.cpp @@ -165,7 +165,7 @@ bool AttachmentHandler::view( TQWidget *parent, Attachment *attachment ) bool stat = true; if ( attachment->isUri() ) { - kapp->invokeBrowser( attachment->uri() ); + tdeApp->invokeBrowser( attachment->uri() ); } else { // put the attachment in a temporary file and launch it KURL tempUrl = tempFileForAttachment( attachment ); diff --git a/libkcal/calendar.h b/libkcal/calendar.h index 08255938..19b87687 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h @@ -39,7 +39,7 @@ #include "kcalversion.h" #include "person.h" -#include <tdepimmacros.h> +#include <tdemacros.h> #include <tqobject.h> #include <tqstring.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/calendarlocal.h b/libkcal/calendarlocal.h index a77238e4..b14607fc 100644 --- a/libkcal/calendarlocal.h +++ b/libkcal/calendarlocal.h @@ -24,7 +24,7 @@ #include "calendar.h" #include <tqdict.h> -#include <tdepimmacros.h> +#include <tdemacros.h> namespace KCal { diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp index bfc493ba..bee2bf31 100644 --- a/libkcal/calendarresources.cpp +++ b/libkcal/calendarresources.cpp @@ -33,7 +33,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include "vcaldrag.h" @@ -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/calformat.h b/libkcal/calformat.h index b3b7160d..39bd98bf 100644 --- a/libkcal/calformat.h +++ b/libkcal/calformat.h @@ -50,7 +50,7 @@ class LIBKCAL_EXPORT CalFormat /** loads a calendar on disk into the calendar associated with this format. - Returns TRUE if successful,else returns FALSE. + Returns true if successful,else returns false. @param fileName the name of the calendar on disk. */ virtual bool load(Calendar *, const TQString &fileName) = 0; 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 f92d4ae5..401af879 100644 --- a/libkcal/confirmsavedialog.h +++ b/libkcal/confirmsavedialog.h @@ -23,13 +23,13 @@ #include <libkcal/incidence.h> #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <tdemacros.h> 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/convertqtopia.cpp b/libkcal/convertqtopia.cpp index a626231f..e6273c5a 100644 --- a/libkcal/convertqtopia.cpp +++ b/libkcal/convertqtopia.cpp @@ -30,7 +30,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <iostream> diff --git a/libkcal/customproperties.h b/libkcal/customproperties.h index e1b020dc..60de5c50 100644 --- a/libkcal/customproperties.h +++ b/libkcal/customproperties.h @@ -24,7 +24,7 @@ #include <tqstring.h> #include <tqmap.h> -#include <tdepimmacros.h> +#include <tdemacros.h> #include "libkcal_export.h" diff --git a/libkcal/dummyscheduler.cpp b/libkcal/dummyscheduler.cpp index 7a824f08..c3cc6123 100644 --- a/libkcal/dummyscheduler.cpp +++ b/libkcal/dummyscheduler.cpp @@ -27,7 +27,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "event.h" #include "icalformat.h" diff --git a/libkcal/event.h b/libkcal/event.h index 9bd217e1..93b439f8 100644 --- a/libkcal/event.h +++ b/libkcal/event.h @@ -22,7 +22,7 @@ #define KCAL_EVENT_H #include "incidence.h" -#include <tdepimmacros.h> +#include <tdemacros.h> namespace KCal { @@ -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/freebusyurlstore.cpp b/libkcal/freebusyurlstore.cpp index a4a42b5c..03204f35 100644 --- a/libkcal/freebusyurlstore.cpp +++ b/libkcal/freebusyurlstore.cpp @@ -23,7 +23,7 @@ #include <kstaticdeleter.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> using namespace KCal; 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/icalformat.h b/libkcal/icalformat.h index 8da2868a..423738df 100644 --- a/libkcal/icalformat.h +++ b/libkcal/icalformat.h @@ -26,7 +26,7 @@ #include "scheduler.h" #include "calformat.h" -#include <tdepimmacros.h> +#include <tdemacros.h> namespace KCal { 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/incidence.h b/libkcal/incidence.h index 20579ce7..2f3bb3e8 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h @@ -32,7 +32,7 @@ #include "libkcal_export.h" #include "incidencebase.h" -#include <tdepimmacros.h> +#include <tdemacros.h> namespace KCal { 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..887d000a 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -575,9 +575,22 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event, } if ( !event->description().isEmpty() ) { + TQString description = event->description(); + + // Regular expression to match URLs + TQRegExp urlRegex("https?://[^\\s]+"); + + int pos = 0; + while ((pos = urlRegex.search(description, pos)) != -1) { + TQString url = urlRegex.cap(0); + TQString link = "<a href=\"" + url + "\">" + url + "</a>"; + description.replace(pos, url.length(), link); + pos += link.length(); + } + tmpStr += "<tr>"; tmpStr += "<td><b>" + i18n( "Description:" ) + "</b></td>"; - tmpStr += "<td>" + event->description() + "</td>"; + tmpStr += "<td>" + description + "</td>"; tmpStr += "</tr>"; } @@ -2837,7 +2850,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/journal.h b/libkcal/journal.h index a3289d57..3bd10729 100644 --- a/libkcal/journal.h +++ b/libkcal/journal.h @@ -23,7 +23,7 @@ #define KCAL_JOURNAL_H #include "incidence.h" -#include <tdepimmacros.h> +#include <tdemacros.h> namespace KCal { diff --git a/libkcal/kcal_manager.desktop b/libkcal/kcal_manager.desktop index 40429a46..356b2b6c 100644 --- a/libkcal/kcal_manager.desktop +++ b/libkcal/kcal_manager.desktop @@ -1,63 +1,6 @@ [Desktop Entry] Name=Calendar -Name[af]=Kalender -Name[ar]=التقويم -Name[be]=Каляндар -Name[bg]=Календар -Name[br]=Deiziadur -Name[bs]=Kalendar -Name[ca]=Calendari -Name[cs]=Kalendář -Name[cy]=Calendr -Name[da]=Kalender -Name[de]=Kalender -Name[el]=Ημερολόγιο -Name[eo]=Kalendaro -Name[es]=Calendario -Name[et]=Kalender -Name[eu]=Egutegia -Name[fa]=تقویم -Name[fi]=Kalenteri -Name[fr]=Calendrier -Name[fy]=Aginda -Name[ga]=Féilire -Name[gl]=Calendario -Name[he]=לוח שנה -Name[hi]=कैलेन्डर -Name[hu]=Naptár -Name[is]=Dagatal -Name[it]=Calendario -Name[ja]=カレンダー -Name[kk]=Күнтізбе -Name[km]=ប្រតិទិន -Name[lt]=Kalendorius -Name[mk]=Календар -Name[ms]=Kalendar -Name[nb]=Kalender -Name[nds]=Kalenner -Name[ne]=क्यालेन्डर -Name[nl]=Agenda -Name[nn]=Kalender -Name[pa]=ਕੈਲੰਡਰ -Name[pl]=Kalendarz -Name[pt]=Calendário -Name[pt_BR]=Calendário -Name[ru]=Календарь -Name[se]=Kaleandar -Name[sk]=Kalendár -Name[sl]=Koledar -Name[sr]=Календар -Name[sr@Latn]=Kalendar -Name[sv]=Kalender -Name[ta]=நாள்காட்டி -Name[tg]=Тақвим -Name[th]=บันทึกประจำวัน -Name[tr]=Takvim -Name[uk]=Календар -Name[uz]=Календар -Name[zh_CN]=日历 -Name[zh_TW]=行事曆 + Type=Service X-TDE-ServiceTypes=TDEResources/Manager - X-TDE-ResourceFamily=calendar diff --git a/libkcal/kcalversion.h b/libkcal/kcalversion.h index 13422197..8eac5f4c 100644 --- a/libkcal/kcalversion.h +++ b/libkcal/kcalversion.h @@ -21,6 +21,8 @@ #ifndef KCAL_KCALVERSION_H #define KCAL_KCALVERSION_H +#include <tdeversion.h> + #define LIBKCAL_IS_VERSION( a,b,c ) ( LIBKCAL_VERSION >= TDE_MAKE_VERSION(a,b,c) ) #define LIBKCAL_VERSION TDE_MAKE_VERSION(1,3,0) #define LIBKCAL_VERSIONSTR "1.3" diff --git a/libkcal/libical/src/libical/icalattach.c b/libkcal/libical/src/libical/icalattach.c index 106096bf..a2c1bd4c 100644 --- a/libkcal/libical/src/libical/icalattach.c +++ b/libkcal/libical/src/libical/icalattach.c @@ -1,4 +1,4 @@ -/* -*- Mode: C -*- +/* ====================================================================== FILE: icalattach.c CREATOR: acampi 28 May 02 diff --git a/libkcal/libkcal_export.h b/libkcal/libkcal_export.h index 88f270d0..e6ffe4f9 100644 --- a/libkcal/libkcal_export.h +++ b/libkcal/libkcal_export.h @@ -21,8 +21,8 @@ #ifndef KCAL_KCALEXPORT_H #define KCAL_KCALEXPORT_H -#include <tdepimmacros.h> +#include <tdemacros.h> -#define LIBKCAL_EXPORT KDE_EXPORT +#define LIBKCAL_EXPORT TDE_EXPORT #endif diff --git a/libkcal/local.desktop b/libkcal/local.desktop index d52ecd5d..870e4ccc 100644 --- a/libkcal/local.desktop +++ b/libkcal/local.desktop @@ -1,57 +1,6 @@ [Desktop Entry] Name=Calendar in Local File -Name[af]=Kalender in plaaslike lêer -Name[be]=Каляндар у лякальным файле -Name[bg]=Календар в локален файл -Name[br]=Deiziadur e restr lec'hel -Name[bs]=Kalendar u lokalnoj datoteci -Name[ca]=Calendari a un fitxer local -Name[cs]=Kalendář v lokálním souboru -Name[cy]=Calendr mewn Ffeil Lleol -Name[da]=Kalender i lokal fil -Name[de]=Kalender in lokaler Datei -Name[el]=Ημερολόγιο σε τοπικό αρχείο -Name[eo]=Kalendaro en loka dosiero -Name[es]=Calendario en archivo local -Name[et]=Kalender kohalikus failis -Name[eu]=Egutegia fitxategi lokalean -Name[fa]=تقویم در پروندۀ محلی -Name[fi]=Kalenteri paikallisessa tiedostossa -Name[fr]=Calendrier dans un fichier local -Name[fy]=Aginda yn lokaal triem -Name[ga]=Féilire i gComhad Logánta -Name[gl]=Calendario nun Ficheiro Local -Name[hi]=स्थानीय फ़ाइल में कैलेन्डर -Name[hu]=Helyi fájlban tárolt naptár -Name[is]=Dagatal í staðbundinni skrá -Name[it]=Calendario in file locale -Name[ja]=ローカルファイルのカレンダー -Name[kk]=Жергілікті файлдағы күнтізбе -Name[km]=ប្រតិទិននៅក្នុងឯកសារមូលដ្ឋាន -Name[lt]=Kalendorius vietinėje byloje -Name[mk]=Календар во локална датотека -Name[ms]=Kalendar dalam Fail Setempat -Name[nb]=Kalender i lokal fil -Name[nds]=Kalenner as lokaal Datei -Name[ne]=स्थानीय फाइलको क्यालेन्डर -Name[nl]=Agenda in lokaal bestand -Name[nn]=Kalender i lokal fil -Name[pl]=Kalendarz w pliku lokalnym -Name[pt]=Calendário num Ficheiro Local -Name[pt_BR]=Calendário em Arquivo Local -Name[ro]=Calendar în fişier local -Name[ru]=Календарь в локальном файле -Name[sk]=Kalendár v lokálnom súbore -Name[sl]=Koledar v krajevni datoteki -Name[sr]=Календар у локалном фајлу -Name[sr@Latn]=Kalendar u lokalnom fajlu -Name[sv]=Kalender i lokal fil -Name[ta]=பொது அடைவில் உள்ள நாள்காட்டி -Name[tg]=Тақвимот дар файли локалӣ -Name[tr]=Yerel Dosyadaki Takvim -Name[uk]=Календар у локальному файлі -Name[zh_CN]=本地文件中的日历 -Name[zh_TW]=本地檔案中的行事曆 + X-TDE-Library=kcal_local Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/libkcal/localdir.desktop b/libkcal/localdir.desktop index 37e89053..df2a7632 100644 --- a/libkcal/localdir.desktop +++ b/libkcal/localdir.desktop @@ -1,57 +1,6 @@ [Desktop Entry] Name=Calendar in Local Directory -Name[af]=Kalender in plaaslike gids -Name[be]=Каляндар у лякальным каталёгу -Name[bg]=Календар в локална директория -Name[br]=Deiziadur en ur restr lec'hel -Name[bs]=Kalendar u lokalnom direktoriju -Name[ca]=Calendari a un directori local -Name[cs]=Kalendář v lokální složce -Name[cy]=Calendr mewn Cyfeiriadur Lleol -Name[da]=Kalender i lokal mappe -Name[de]=Kalender in lokalem Ordner -Name[el]=Ημερολόγιο σε τοπικό κατάλογο -Name[eo]=Kalendaro en loka dosierujo -Name[es]=Calendario en el directorio local -Name[et]=Kalender kohalikus kataloogis -Name[eu]=Egutegia direktorio lokalean -Name[fa]=تقویم در فهرست راهنمای محلی -Name[fi]=Kalenteri paikallisessa kansiossa -Name[fr]=Calendrier dans un dossier local -Name[fy]=Aginda yn lokale triemtafel -Name[ga]=Féilire i gComhadlann Logánta -Name[gl]=Calendario nun Cartafol Local -Name[hi]=स्थानीय डिरेक्ट्री में कैलेन्डर -Name[hu]=Helyi könyvtárban tárolt naptár -Name[is]=Dagatal í staðbundinni möppu -Name[it]=Calendario nella directory locale -Name[ja]=ローカルディレクトリのカレンダー -Name[kk]=Жергілікті каталогтағы күнтізбе -Name[km]=ប្រតិទិននៅក្នុងថតមូលដ្ឋាន -Name[lt]=Kalendorius vietiniame aplanke -Name[mk]=Календар во локална папка -Name[ms]=Kalendar dalam Direktori Setempat -Name[nb]=Kalender i lokal katalog -Name[nds]=Kalenner in lokaal Orner -Name[ne]=स्थानीय डाइरेक्टरीको क्यालेन्डर -Name[nl]=Agenda in lokale map -Name[nn]=Kalender i lokal mappe -Name[pl]=Kalendarz w katalogu lokalnym -Name[pt]=Calendário numa Directoria Local -Name[pt_BR]=Calendário em Diretório Local -Name[ro]=Calendar în director local -Name[ru]=Календарь в локальной папке -Name[sk]=Kalendár v lokálnom priečinku -Name[sl]=Koledar v krajevnem imeniku -Name[sr]=Календар у локалном директоријуму -Name[sr@Latn]=Kalendar u lokalnom direktorijumu -Name[sv]=Kalender i lokal katalog -Name[ta]=பொது அடைவில் உள்ள நாள்காட்டி -Name[tg]=Тақвимот дар каталоги локалӣ -Name[tr]=Yerel Dizindeki Takvim -Name[uk]=Календар у локальному каталозі -Name[zh_CN]=本地目录中的日历 -Name[zh_TW]=本地目錄中的行事曆 + X-TDE-Library=kcal_localdir Type=Service X-TDE-ServiceTypes=TDEResources/Plugin 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..aeb7e44e 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kurl.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "event.h" #include "exceptions.h" @@ -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 94c00ae4..34356377 100644 --- a/libkcal/resourcecached.h +++ b/libkcal/resourcecached.h @@ -34,7 +34,7 @@ #include <tqdatetime.h> #include <tqtimer.h> -#include <tdepimmacros.h> +#include <tdemacros.h> namespace KCal { @@ -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 0ee57793..f30cc63c 100644 --- a/libkcal/resourcecachedconfig.h +++ b/libkcal/resourcecachedconfig.h @@ -22,7 +22,7 @@ #define KCAL_RESOURCECACHEDCONFIG_H #include <tqwidget.h> -#include <tdepimmacros.h> +#include <tdemacros.h> class TQButtonGroup; class TQSpinBox; @@ -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 f33b7da4..f3713143 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -41,7 +41,7 @@ #include <tderesources/resource.h> #include <tderesources/manager.h> #include <tdeabc/lock.h> -#include <tdepimmacros.h> +#include <tdemacros.h> namespace KCal { @@ -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..f6ba2b8f 100644 --- a/libkcal/resourcelocal.cpp +++ b/libkcal/resourcelocal.cpp @@ -30,7 +30,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kurl.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "vcaldrag.h" #include "vcalformat.h" @@ -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 d13ed2d8..0c6773f8 100644 --- a/libkcal/resourcelocal.h +++ b/libkcal/resourcelocal.h @@ -27,7 +27,7 @@ #include <kurl.h> #include <kdirwatch.h> -#include <tdepimmacros.h> +#include <tdemacros.h> class TDEConfig; #include "calendarlocal.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..5d3c40ff 100644 --- a/libkcal/resourcelocalconfig.cpp +++ b/libkcal/resourcelocalconfig.cpp @@ -28,7 +28,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "vcaldrag.h" #include "vcalformat.h" @@ -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 7a1e7f72..d7747b63 100644 --- a/libkcal/resourcelocalconfig.h +++ b/libkcal/resourcelocalconfig.h @@ -28,7 +28,7 @@ #include <tderesources/resource.h> #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <tdemacros.h> #include "libkcal_export.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..d3d19f0b 100644 --- a/libkcal/resourcelocaldir.cpp +++ b/libkcal/resourcelocaldir.cpp @@ -31,7 +31,7 @@ #include <tdelocale.h> #include <kurl.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "vcaldrag.h" #include "vcalformat.h" @@ -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 6826da6b..144397c4 100644 --- a/libkcal/resourcelocaldir.h +++ b/libkcal/resourcelocaldir.h @@ -23,7 +23,7 @@ #include <kurl.h> #include <kdirwatch.h> -#include <tdepimmacros.h> +#include <tdemacros.h> #include "resourcecached.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.cpp b/libkcal/resourcelocaldirconfig.cpp index afe9c95b..5725452f 100644 --- a/libkcal/resourcelocaldirconfig.cpp +++ b/libkcal/resourcelocaldirconfig.cpp @@ -27,7 +27,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "vcaldrag.h" #include "vcalformat.h" 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.cpp b/libkcal/scheduler.cpp index c398a77c..3481f9cb 100644 --- a/libkcal/scheduler.cpp +++ b/libkcal/scheduler.cpp @@ -23,7 +23,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "calhelper.h" #include "event.h" 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/fbrecurring.cpp b/libkcal/tests/fbrecurring.cpp index be70a7c8..e4678a54 100644 --- a/libkcal/tests/fbrecurring.cpp +++ b/libkcal/tests/fbrecurring.cpp @@ -20,7 +20,7 @@ int main() event1->setDtStart( TQDateTime(TQDate(2006,1,1), TQTime(12,0,0)) ); //event1->setDuration(60*60); event1->setDtEnd( TQDateTime(TQDate(2006,1,1), TQTime(13,0,0)) ); - event1->setFloats(FALSE); + event1->setFloats(false); event1->recurrence()->setDaily( 1 ); //event1->recurrence()->setDuration( 2 ); event1->recurrence()->setEndDateTime( TQDateTime(TQDate(2006,1,3), TQTime(13,0,0)) ); @@ -32,7 +32,7 @@ int main() event2->setDtStart( TQDateTime(TQDate(2006,1,1), TQTime(13,0,0)) ); //event2->setDuration(60*60); event2->setDtEnd( TQDateTime(TQDate(2006,1,1), TQTime(14,0,0)) ); - event2->setFloats(FALSE); + event2->setFloats(false); event2->recurrence()->setDaily( 1 ); //event2->recurrence()->setDuration( 3 ); event2->recurrence()->setEndDateTime( TQDateTime(TQDate(2006,1,4), TQTime(13,0,0)) ); 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: /** diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index f78ad2a3..539921fa 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp @@ -71,7 +71,7 @@ bool VCalFormat::load(Calendar *calendar, const TQString &fileName) if (!vcal) { setException(new ErrorFormat(ErrorFormat::CalVersionUnknown)); - return FALSE; + return false; } // any other top-level calendar stuff should be added/initialized here @@ -503,7 +503,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent) } else if (recur->duration() == -1) { tmpStr += "#0"; // defined as repeat forever } else { - tmpStr += qDateTimeToISO(recur->endDateTime(), FALSE); + tmpStr += qDateTimeToISO(recur->endDateTime(), false); } // Only write out the rrule if we have a valid recurrence (i.e. a known // type in thee switch above) @@ -948,11 +948,11 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) // "take up" any time. /*if ((isAPropertyOf(vevent, VCDTstartProp) == 0) || (isAPropertyOf(vevent, VCDTendProp) == 0)) { - anEvent->setFloats(TRUE); + anEvent->setFloats(true); } else { }*/ - anEvent->setFloats(FALSE); + anEvent->setFloats(false); // start time if ((vo = isAPropertyOf(vevent, VCDTstartProp)) != 0) { @@ -960,7 +960,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) // kdDebug(5800) << "s is " << // s << ", ISO is " << ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo))).toString() << endl; deleteStr(s); if (anEvent->dtStart().time().isNull()) - anEvent->setFloats(TRUE); + anEvent->setFloats(true); } // stop time @@ -968,7 +968,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) anEvent->setDtEnd(ISOToTQDateTime(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); if (anEvent->dtEnd().time().isNull()) - anEvent->setFloats(TRUE); + anEvent->setFloats(true); } // at this point, there should be at least a start or end time. @@ -1071,7 +1071,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) } anEvent->recurrence()->addMonthlyPos( tmpPos, qba ); qba.detach(); - qba.fill(FALSE); // clear out + qba.fill(false); // clear out } // while != "#" } break;} diff --git a/libkcal/vcalformat.h b/libkcal/vcalformat.h index facda241..60151ff9 100644 --- a/libkcal/vcalformat.h +++ b/libkcal/vcalformat.h @@ -86,7 +86,7 @@ class LIBKCAL_EXPORT VCalFormat : public CalFormat /** takes a TQDate and returns a string in the format YYYYMMDDTHHMMSS */ TQString qDateToISO(const TQDate &); /** takes a TQDateTime and returns a string in format YYYYMMDDTHHMMSS */ - TQString qDateTimeToISO(const TQDateTime &, bool zulu=TRUE); + TQString qDateTimeToISO(const TQDateTime &, bool zulu=true); /** takes a string in the format YYYYMMDDTHHMMSS and returns a * valid TQDateTime. */ TQDateTime ISOToTQDateTime(const TQString & dtStr); |