From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kalarm/alarmevent.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'kalarm/alarmevent.h') diff --git a/kalarm/alarmevent.h b/kalarm/alarmevent.h index 0436d3fb..75ff7cbe 100644 --- a/kalarm/alarmevent.h +++ b/kalarm/alarmevent.h @@ -58,9 +58,9 @@ class KAAlarmEventBase public: ~KAAlarmEventBase() { } const TQString& cleanText() const { return mText; } - TQString message() const { return (mActionType == T_MESSAGE || mActionType == T_EMAIL) ? mText : TQString::null; } - TQString fileName() const { return (mActionType == T_FILE) ? mText : TQString::null; } - TQString command() const { return (mActionType == T_COMMAND) ? mText : TQString::null; } + TQString message() const { return (mActionType == T_MESSAGE || mActionType == T_EMAIL) ? mText : TQString(); } + TQString fileName() const { return (mActionType == T_FILE) ? mText : TQString(); } + TQString command() const { return (mActionType == T_COMMAND) ? mText : TQString(); } uint emailFromId() const { return mEmailFromIdentity; } const EmailAddressList& emailAddresses() const { return mEmailAddresses; } TQString emailAddresses(const TQString& sep) const { return mEmailAddresses.join(sep); } @@ -200,7 +200,7 @@ class KAAlarm : public KAAlarmEventBase ? mNextMainDateTime.addSecs(mNextRepeat * mRepeatInterval * 60) : mNextMainDateTime; } TQDate date() const { return mNextMainDateTime.date(); } TQTime time() const { return mNextMainDateTime.time(); } - TQString audioFile() const { return (mActionType == T_AUDIO) && !mBeep ? mText : TQString::null; } + TQString audioFile() const { return (mActionType == T_AUDIO) && !mBeep ? mText : TQString(); } float soundVolume() const { return (mActionType == T_AUDIO) && !mBeep && !mText.isEmpty() ? mSoundVolume : -1; } float fadeVolume() const { return (mActionType == T_AUDIO) && mSoundVolume >= 0 && mFadeSeconds && !mBeep && !mText.isEmpty() ? mFadeVolume : -1; } int fadeSeconds() const { return (mActionType == T_AUDIO) && mSoundVolume >= 0 && mFadeVolume >= 0 && !mBeep && !mText.isEmpty() ? mFadeSeconds : 0; } @@ -266,7 +266,7 @@ class KAEvent : public KAAlarmEventBase READ_ONLY_FLAGS = 0xF0000 // tqmask for all read-only internal values }; /** The category of an event, indicated by the middle part of its UID. */ - enum Status + enum tqStatus { ACTIVE, // the event is currently active EXPIRED, // the event has expired @@ -331,7 +331,7 @@ class KAEvent : public KAAlarmEventBase void setLateCancel(int lc) { mLateCancel = lc; mUpdated = true; } void setAutoClose(bool ac) { mAutoClose = ac; mUpdated = true; } void setRepeatAtLogin(bool rl) { mRepeatAtLogin = rl; mUpdated = true; } - void setUid(Status s) { mEventID = uid(mEventID, s); mUpdated = true; } + void setUid(tqStatus s) { mEventID = uid(mEventID, s); mUpdated = true; } void setKMailSerialNumber(unsigned long n) { mKMailSerialNumber = n; } void setLogFile(const TQString& logfile); void setReminder(int minutes, bool onceOnly); @@ -408,10 +408,10 @@ class KAEvent : public KAAlarmEventBase bool enabled() const { return mEnabled; } bool updated() const { return mUpdated; } bool mainExpired() const { return mMainExpired; } - bool expired() const { return mDisplaying && mMainExpired || uidStatus(mEventID) == EXPIRED; } - Status uidStatus() const { return uidStatus(mEventID); } - static Status uidStatus(const TQString& uid); - static TQString uid(const TQString& id, Status); + bool expired() const { return mDisplaying && mMainExpired || uidtqStatus(mEventID) == EXPIRED; } + tqStatus uidtqStatus() const { return uidtqStatus(mEventID); } + static tqStatus uidtqStatus(const TQString& uid); + static TQString uid(const TQString& id, tqStatus); static KAEvent findTemplateName(AlarmCalendar&, const TQString& name); struct MonthPos -- cgit v1.2.3