From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- kalarm/functions.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kalarm/functions.h') diff --git a/kalarm/functions.h b/kalarm/functions.h index 9d5b1900..b8a1a51d 100644 --- a/kalarm/functions.h +++ b/kalarm/functions.h @@ -48,7 +48,7 @@ enum FileType { Unknown, TextPlain, TextFormatted, TextApplication, Image }; /** Return codes from calendar update functions. * The codes are ordered by severity. */ -enum UpdateStatus { +enum UpdatetqStatus { UPDATE_OK, // update succeeded UPDATE_KORG_ERR, // update succeeded, but KOrganizer update failed UPDATE_ERROR, // update failed partially @@ -94,18 +94,18 @@ void resetDaemonIfQueued(); // must only be called from KAlarm TQString runKMail(bool minimise); bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage); -UpdateStatus addEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool useEventID = false, bool allowKOrgUpdate = true); +UpdatetqStatus addEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool useEventID = false, bool allowKOrgUpdate = true); bool addExpiredEvent(KAEvent&); -UpdateStatus addTemplate(KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); -UpdateStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent = 0); -UpdateStatus updateEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool archiveOnDelete = true, bool incRevision = true); -UpdateStatus updateTemplate(const KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); -UpdateStatus deleteEvent(KAEvent&, bool archive = true, TQWidget* errmsgParent = 0); -UpdateStatus deleteTemplate(const KAEvent&); +UpdatetqStatus addTemplate(KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); +UpdatetqStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent = 0); +UpdatetqStatus updateEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool archiveOnDelete = true, bool incRevision = true); +UpdatetqStatus updateTemplate(const KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); +UpdatetqStatus deleteEvent(KAEvent&, bool archive = true, TQWidget* errmsgParent = 0); +UpdatetqStatus deleteTemplate(const KAEvent&); void deleteDisplayEvent(const TQString& eventID); -UpdateStatus reactivateEvent(KAEvent&, AlarmListView* selectionView, bool useEventID = false); -UpdateStatus enableEvent(KAEvent&, AlarmListView* selectionView, bool enable); -void displayUpdateError(TQWidget* parent, UpdateStatus, UpdateError, int nAlarms); +UpdatetqStatus reactivateEvent(KAEvent&, AlarmListView* selectionView, bool useEventID = false); +UpdatetqStatus enableEvent(KAEvent&, AlarmListView* selectionView, bool enable); +void displayUpdateError(TQWidget* parent, UpdatetqStatus, UpdateError, int nAlarms); void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError, int nAlarms); TQString stripAccel(const TQString&); -- cgit v1.2.3