summaryrefslogtreecommitdiffstats
path: root/tdeui/kcommand.h
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
commit7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch)
treec76702a7f6310fbe9d437e347535422e836e94e9 /tdeui/kcommand.h
parenta2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff)
parent27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff)
downloadtdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz
tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeui/kcommand.h')
-rw-r--r--tdeui/kcommand.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/tdeui/kcommand.h b/tdeui/kcommand.h
index f802f8d64..e27e5178b 100644
--- a/tdeui/kcommand.h
+++ b/tdeui/kcommand.h
@@ -26,8 +26,8 @@
#include <tqobject.h>
#include <tdelibs_export.h>
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
class TQPopupMenu;
/**
@@ -171,7 +171,7 @@ public:
* into a toolbar.
* @param actionCollection the parent collection
*/
- KCommandHistory(KActionCollection *actionCollection, bool withMenus = true);
+ KCommandHistory(TDEActionCollection *actionCollection, bool withMenus = true);
/**
* Destructs the command history object.
@@ -222,12 +222,12 @@ public:
public slots:
/**
* Undoes the last action.
- * Call this if you don't use the builtin KActions.
+ * Call this if you don't use the builtin TDEActions.
*/
virtual void undo();
/**
* Redoes the last undone action.
- * Call this if you don't use the builtin KActions.
+ * Call this if you don't use the builtin TDEActions.
*/
virtual void redo();
/**
@@ -275,7 +275,7 @@ private:
void clipCommands(); // ensures that the limits are kept
TQPtrList<KCommand> m_commands;
- KAction *m_undo, *m_redo;
+ TDEAction *m_undo, *m_redo;
TQPopupMenu *m_undoPopup, *m_redoPopup;
int m_undoLimit, m_redoLimit;
bool m_first; // attention: it's the first command in the list!