summaryrefslogtreecommitdiffstats
path: root/libkcal/incidence.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libkcal/incidence.cpp')
-rw-r--r--libkcal/incidence.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 0c27da432..b26b62147 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -33,7 +33,7 @@ using namespace KCal;
Incidence::Incidence() :
IncidenceBase(),
- mRelatedTo(0), mtqStatus(StatusNone), mSecrecy(SecrecyPublic),
+ mRelatedTo(0), mStatus(StatusNone), mSecrecy(SecrecyPublic),
mPriority(0), mRecurrence(0),
mHasRecurrenceID( false ), mChildRecurrenceEvents()
{
@@ -57,7 +57,7 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i ),Recurrence::Obse
// Incidence::List mRelations; Incidence::List mRelations;
mResources = i.mResources;
mStatusString = i.mStatusString;
- mtqStatus = i.mtqStatus;
+ mStatus = i.mStatus;
mSecrecy = i.mSecrecy;
mPriority = i.mPriority;
mLocation = i.mLocation;
@@ -125,7 +125,7 @@ Incidence& Incidence::operator=( const Incidence &i )
mRelations.clear();
mResources = i.mResources;
mStatusString = i.mStatusString;
- mtqStatus = i.mtqStatus;
+ mStatus = i.mStatus;
mSecrecy = i.mSecrecy;
mPriority = i.mPriority;
mLocation = i.mLocation;
@@ -196,8 +196,8 @@ bool Incidence::operator==( const Incidence& i2 ) const
relations() == i2.relations() &&
attachments() == i2.attachments() &&
resources() == i2.resources() &&
- mtqStatus == i2.mtqStatus &&
- ( mtqStatus == StatusNone || stringCompare( mStatusString, i2.mStatusString ) ) &&
+ mStatus == i2.mStatus &&
+ ( mStatus == StatusNone || stringCompare( mStatusString, i2.mStatusString ) ) &&
secrecy() == i2.secrecy() &&
priority() == i2.priority() &&
stringCompare( location(), i2.location() ) &&
@@ -207,16 +207,16 @@ bool Incidence::operator==( const Incidence& i2 ) const
void Incidence::recreate()
{
- setCreated(TQDateTime::tqcurrentDateTime());
+ setCreated(TQDateTime::currentDateTime());
setUid(CalFormat::createUniqueId());
setSchedulingID( TQString() );
setRevision(0);
- setLastModified(TQDateTime::tqcurrentDateTime());
+ setLastModified(TQDateTime::currentDateTime());
setPilotId( 0 );
- setSynctqStatus( SYNCNONE );
+ setSyncStatus( SYNCNONE );
}
void Incidence::setReadOnly( bool readOnly )
@@ -738,35 +738,35 @@ int Incidence::priority() const
return mPriority;
}
-void Incidence::setqStatus(Incidence::tqStatus status)
+void Incidence::seStatus(Incidence::Status status)
{
if (mReadOnly || status == StatusX) return;
- mtqStatus = status;
+ mStatus = status;
mStatusString = TQString();
updated();
}
-void Incidence::setCustomtqStatus(const TQString &status)
+void Incidence::setCustomStatus(const TQString &status)
{
if (mReadOnly) return;
- mtqStatus = status.isEmpty() ? StatusNone : StatusX;
+ mStatus = status.isEmpty() ? StatusNone : StatusX;
mStatusString = status;
updated();
}
-Incidence::tqStatus Incidence::status() const
+Incidence::Status Incidence::status() const
{
- return mtqStatus;
+ return mStatus;
}
TQString Incidence::statusStr() const
{
- if (mtqStatus == StatusX)
+ if (mStatus == StatusX)
return mStatusString;
- return statusName(mtqStatus);
+ return statusName(mStatus);
}
-TQString Incidence::statusName(Incidence::tqStatus status)
+TQString Incidence::statusName(Incidence::Status status)
{
switch (status) {
case StatusTentative: return i18n("incidence status", "Tentative");