summaryrefslogtreecommitdiffstats
path: root/kalarm/undo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kalarm/undo.cpp')
-rw-r--r--kalarm/undo.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index 63168f45e..b2703d0f7 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -52,8 +52,8 @@ class UndoItem
int id() const { return mId; }
Undo::Type type() const { return mType; }
void setType(Undo::Type t) { mType = t; }
- KAEvent::tqStatus calendar() const { return mCalendar; }
- virtual void setCalendar(KAEvent::tqStatus s) { mCalendar = s; }
+ KAEvent::Status calendar() const { return mCalendar; }
+ virtual void setCalendar(KAEvent::Status s) { mCalendar = s; }
virtual UndoItem* restore() = 0;
virtual bool deleteID(const TQString& /*id*/) { return false; }
@@ -66,13 +66,13 @@ class UndoItem
protected:
UndoItem(Undo::Type);
- static TQString addDeleteActionText(KAEvent::tqStatus, bool add);
+ static TQString addDeleteActionText(KAEvent::Status, bool add);
TQString description(const KAEvent&) const;
void replaceWith(UndoItem* item) { Undo::replace(this, item); }
int mId; // unique identifier (only for mType = UNDO, REDO)
Undo::Type mType; // which list (if any) the object is in
- KAEvent::tqStatus mCalendar;
+ KAEvent::Status mCalendar;
};
class UndoMultiBase : public UndoItem
@@ -101,7 +101,7 @@ class UndoAdd : public UndoItem
{
public:
UndoAdd(Undo::Type, const KAEvent&);
- UndoAdd(Undo::Type, const KAEvent&, KAEvent::tqStatus);
+ UndoAdd(Undo::Type, const KAEvent&, KAEvent::Status);
virtual Operation operation() const { return ADD; }
virtual TQString actionText() const;
virtual TQString description() const { return mDescription; }
@@ -357,7 +357,7 @@ bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* parent, const TQSt
case UndoItem::ERR_PROG: err = i18n("Program error"); break;
default: err = i18n("Unknown error"); break;
}
- KMessageBox::sorry(parent, i18n("Undo-action: message", "%1: %2").tqarg(action).tqarg(err));
+ KMessageBox::sorry(parent, i18n("Undo-action: message", "%1: %2").arg(action).arg(err));
return false;
}
@@ -586,7 +586,7 @@ TQString UndoItem::description(const KAEvent& event) const
/******************************************************************************
* Return the action description of an add or delete Undo/Redo item for displaying.
*/
-TQString UndoItem::addDeleteActionText(KAEvent::tqStatus calendar, bool add)
+TQString UndoItem::addDeleteActionText(KAEvent::Status calendar, bool add)
{
switch (calendar)
{
@@ -695,11 +695,11 @@ UndoAdd::UndoAdd(Undo::Type type, const KAEvent& event)
: UndoItem(type),
mEventID(event.id())
{
- setCalendar(KAEvent::uidtqStatus(mEventID));
+ setCalendar(KAEvent::uidStatus(mEventID));
mDescription = UndoItem::description(event); // calendar must be set before calling this
}
-UndoAdd::UndoAdd(Undo::Type type, const KAEvent& event, KAEvent::tqStatus cal)
+UndoAdd::UndoAdd(Undo::Type type, const KAEvent& event, KAEvent::Status cal)
: UndoItem(type),
mEventID(KAEvent::uid(event.id(), cal))
{
@@ -793,7 +793,7 @@ UndoEdit::UndoEdit(Undo::Type type, const KAEvent& oldEvent, const TQString& new
mNewEventID(newEventID),
mDescription(description)
{
- setCalendar(KAEvent::uidtqStatus(mNewEventID));
+ setCalendar(KAEvent::uidStatus(mNewEventID));
}
UndoEdit::~UndoEdit()
@@ -880,7 +880,7 @@ UndoDelete::UndoDelete(Undo::Type type, const KAEvent& event)
: UndoItem(type),
mEvent(new KAEvent(event))
{
- setCalendar(KAEvent::uidtqStatus(mEvent->id()));
+ setCalendar(KAEvent::uidStatus(mEvent->id()));
}
UndoDelete::~UndoDelete()