summaryrefslogtreecommitdiffstats
path: root/kalarm/undo.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /kalarm/undo.cpp
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kalarm/undo.cpp')
-rw-r--r--kalarm/undo.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index 8d6a46a32..e1998e9cf 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -68,7 +68,7 @@ class UndoItem
UndoItem(Undo::Type);
static TQString addDeleteActionText(KAEvent::Status, bool add);
TQString description(const KAEvent&) const;
- void replaceWith(UndoItem* item) { Undo::replace(this, item); }
+ void tqreplaceWith(UndoItem* item) { Undo::tqreplace(this, item); }
int mId; // unique identifier (only for mType = UNDO, REDO)
Undo::Type mType; // which list (if any) the object is in
@@ -298,7 +298,7 @@ void Undo::removeRedos(const TQString& eventID)
{
if (item->deleteID(id))
{
- // The old multi-redo was replaced with a new single redo
+ // The old multi-redo was tqreplaced with a new single redo
delete item;
}
++it;
@@ -398,7 +398,7 @@ void Undo::remove(UndoItem* item, bool undo)
/******************************************************************************
* Replace an undo item in one of the lists.
*/
-void Undo::replace(UndoItem* old, UndoItem* New)
+void Undo::tqreplace(UndoItem* old, UndoItem* New)
{
Type type = old->type();
List* list = (type == UNDO) ? &mUndoList : (type == REDO) ? &mRedoList : 0;
@@ -654,8 +654,8 @@ UndoItem* UndoMulti<T>::restore()
/******************************************************************************
* If one of the multiple items has the specified ID, delete it.
* If an item is deleted and there is only one item left, the UndoMulti
-* instance is removed from its list and replaced by the remaining UndoItem instead.
-* Reply = true if this instance was replaced. The caller must delete it.
+* instance is removed from its list and tqreplaced by the remaining UndoItem instead.
+* Reply = true if this instance was tqreplaced. The caller must delete it.
* = false otherwise.
*/
template <class T>
@@ -672,7 +672,7 @@ bool UndoMulti<T>::deleteID(const TQString& id)
{
// There is only one entry left after removal.
// Replace 'this' multi instance with the remaining single entry.
- replaceWith(item);
+ tqreplaceWith(item);
return true;
}
else