summaryrefslogtreecommitdiffstats
path: root/kalarm/functions.h
diff options
context:
space:
mode:
Diffstat (limited to 'kalarm/functions.h')
-rw-r--r--kalarm/functions.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/kalarm/functions.h b/kalarm/functions.h
index 37041f6f2..5a6798640 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
@@ -62,7 +62,7 @@ enum KOrgUpdateError { KORG_ERR_ADD, KORG_ERR_MODIFY, KORG_ERR_DELETE };
/** Display a main window with the specified event selected */
-MainWindow* displayMainWindowSelected(const TQString& eventID = TQString::null);
+MainWindow* displayMainWindowSelected(const TQString& eventID = TQString());
bool readConfigWindowSize(const char* window, TQSize&);
void writeConfigWindowSize(const char* window, const TQSize&);
/** Check from its mime type whether a file appears to be a text or image file.
@@ -76,10 +76,10 @@ int getVersionNumber(const TQString& version, TQString* subVersi
/** Return which version of KAlarm was the first to use the current calendar/event format */
inline int currentCalendarVersion() { return KAEvent::calVersion(); }
inline TQString currentCalendarVersionString() { return KAEvent::calVersionString(); }
-TQString browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile = TQString::null,
- const TQString& filter = TQString::null, int mode = 0, TQWidget* parent = 0, const char* name = 0);
+TQString browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile = TQString(),
+ const TQString& filter = TQString(), int mode = 0, TQWidget* tqparent = 0, const char* name = 0);
bool edit(const TQString& eventID);
-bool editNew(const TQString& templateName = TQString::null);
+bool editNew(const TQString& templateName = TQString());
/** Create a "New Alarm" KAction */
KAction* createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, KActionCollection*, const char* name);
/** Create a "New From Template" KAction */
@@ -88,25 +88,25 @@ TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject*
* If shell commands are disabled, command alarm templates are omitted.
*/
TQValueList<KAEvent> templateList();
-void outputAlarmWarnings(TQWidget* parent, const KAEvent* = 0);
+void outputAlarmWarnings(TQWidget* tqparent, const KAEvent* = 0);
void resetDaemon();
void resetDaemonIfQueued(); // must only be called from KAlarmApp::processQueue()
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);
-void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError, int nAlarms);
+UpdatetqStatus reactivateEvent(KAEvent&, AlarmListView* selectionView, bool useEventID = false);
+UpdatetqStatus enableEvent(KAEvent&, AlarmListView* selectionView, bool enable);
+void displayUpdateError(TQWidget* tqparent, UpdatetqStatus, UpdateError, int nAlarms);
+void displayKOrgUpdateError(TQWidget* tqparent, KOrgUpdateError, int nAlarms);
TQString stripAccel(const TQString&);