summaryrefslogtreecommitdiffstats
path: root/libkcal/alarm.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libkcal/alarm.cpp')
-rw-r--r--libkcal/alarm.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp
index 8bc40f001..a860072da 100644
--- a/libkcal/alarm.cpp
+++ b/libkcal/alarm.cpp
@@ -29,8 +29,8 @@
using namespace KCal;
-Alarm::Alarm(Incidence *parent)
- : mParent(parent),
+Alarm::Alarm(Incidence *tqparent)
+ : mParent(tqparent),
mType(Invalid),
mDescription(""), // to make operator==() not fail
mFile(""), // to make operator==() not fail
@@ -163,7 +163,7 @@ void Alarm::setAudioFile(const TQString &audioFile)
TQString Alarm::audioFile() const
{
- return (mType == Audio) ? mFile : TQString::null;
+ return (mType == Audio) ? mFile : TQString();
}
void Alarm::setProcedureAlarm(const TQString &programFile, const TQString &arguments)
@@ -184,7 +184,7 @@ void Alarm::setProgramFile(const TQString &programFile)
TQString Alarm::programFile() const
{
- return (mType == Procedure) ? mFile : TQString::null;
+ return (mType == Procedure) ? mFile : TQString();
}
void Alarm::setProgramArguments(const TQString &arguments)
@@ -197,7 +197,7 @@ void Alarm::setProgramArguments(const TQString &arguments)
TQString Alarm::programArguments() const
{
- return (mType == Procedure) ? mDescription : TQString::null;
+ return (mType == Procedure) ? mDescription : TQString();
}
void Alarm::setEmailAlarm(const TQString &subject, const TQString &text,
@@ -251,7 +251,7 @@ void Alarm::setMailSubject(const TQString &mailAlarmSubject)
TQString Alarm::mailSubject() const
{
- return (mType == Email) ? mMailSubject : TQString::null;
+ return (mType == Email) ? mMailSubject : TQString();
}
void Alarm::setMailAttachment(const TQString &mailAttachFile)
@@ -294,7 +294,7 @@ void Alarm::setMailText(const TQString &text)
TQString Alarm::mailText() const
{
- return (mType == Email) ? mDescription : TQString::null;
+ return (mType == Email) ? mDescription : TQString();
}
void Alarm::setDisplayAlarm(const TQString &text)
@@ -315,7 +315,7 @@ void Alarm::setText(const TQString &text)
TQString Alarm::text() const
{
- return (mType == Display) ? mDescription : TQString::null;
+ return (mType == Display) ? mDescription : TQString();
}
void Alarm::setTime(const TQDateTime &alarmTime)
@@ -476,9 +476,9 @@ Duration Alarm::endOffset() const
return (mHasTime || !mEndOffset) ? Duration( 0 ) : mOffset;
}
-void Alarm::setParent( Incidence *parent )
+void Alarm::setParent( Incidence *tqparent )
{
- mParent = parent;
+ mParent = tqparent;
}
void Alarm::customPropertyUpdated()