Rename a number of classes to enhance compatibility with KDE4

2 files changed, 12 insertions, 12 deletions

diff --git a/src/document/MultiViewCommandHistory.cpp b/src/document/MultiViewCommandHistory.cpp
index 7e529fb..a4957be 100644
--- a/src/document/MultiViewCommandHistory.cpp
+++ b/src/document/MultiViewCommandHistory.cpp
@@ -65,14 +65,14 @@ MultiViewCommandHistory::clear()
 }
 
 void
-MultiViewCommandHistory::attachView(KActionCollection *collection)
+MultiViewCommandHistory::attachView(TDEActionCollection *collection)
 {
     if (m_views.find(collection) != m_views.end())
         return ;
 
     RG_DEBUG << "MultiViewCommandHistory::attachView() : setting up undo/redo actions\n";
 
-    KToolBarPopupAction *undo = dynamic_cast<KToolBarPopupAction*>(collection->action(KStdAction::stdName(KStdAction::Undo)));
+    TDEToolBarPopupAction *undo = dynamic_cast<TDEToolBarPopupAction*>(collection->action(KStdAction::stdName(KStdAction::Undo)));
 
     if (undo) {
         connect(undo, TQT_SIGNAL(activated()),
@@ -91,7 +91,7 @@ MultiViewCommandHistory::attachView(KActionCollection *collection)
          TQT_SLOT(slotUndoActivated(int)));
     }
 
-    KToolBarPopupAction *redo = dynamic_cast<KToolBarPopupAction*>(collection->action(KStdAction::stdName(KStdAction::Redo)));
+    TDEToolBarPopupAction *redo = dynamic_cast<TDEToolBarPopupAction*>(collection->action(KStdAction::stdName(KStdAction::Redo)));
 
     if (redo) {
 
@@ -117,7 +117,7 @@ MultiViewCommandHistory::attachView(KActionCollection *collection)
 }
 
 void
-MultiViewCommandHistory::detachView(KActionCollection *collection)
+MultiViewCommandHistory::detachView(TDEActionCollection *collection)
 {
     ViewSet::iterator i = m_views.find(collection);
     if (i != m_views.end())
@@ -307,7 +307,7 @@ MultiViewCommandHistory::updateButton(bool undo,
 {
     for (ViewSet::iterator i = m_views.begin(); i != m_views.end(); ++i) {
 
-        KAction *action = (*i)->action(name.ascii());
+        TDEAction *action = (*i)->action(name.ascii());
         if (!action)
             continue;
         TQString text;
@@ -340,12 +340,12 @@ MultiViewCommandHistory::updateMenu(bool undo,
 {
     for (ViewSet::iterator i = m_views.begin(); i != m_views.end(); ++i) {
 
-        KAction *action = (*i)->action(name.ascii());
+        TDEAction *action = (*i)->action(name.ascii());
         if (!action)
             continue;
 
-        KToolBarPopupAction *popupAction =
-            dynamic_cast<KToolBarPopupAction *>(action);
+        TDEToolBarPopupAction *popupAction =
+            dynamic_cast<TDEToolBarPopupAction *>(action);
         if (!popupAction)
             continue;
 
diff --git a/src/document/MultiViewCommandHistory.h b/src/document/MultiViewCommandHistory.h
index 0febb10..71194b9 100644
--- a/src/document/MultiViewCommandHistory.h
+++ b/src/document/MultiViewCommandHistory.h
@@ -33,7 +33,7 @@
 
 class TQString;
 class KCommand;
-class KActionCollection;
+class TDEActionCollection;
 
 
 namespace Rosegarden
@@ -64,8 +64,8 @@ public:
 
     void clear();
     
-    void attachView(KActionCollection *collection);
-    void detachView(KActionCollection *collection);
+    void attachView(TDEActionCollection *collection);
+    void detachView(TDEActionCollection *collection);
 
     void addCommand(KCommand *command, bool execute = true);
     
@@ -126,7 +126,7 @@ signals:
 private:
     //--------------- Data members ---------------------------------
 
-    typedef std::set<KActionCollection *> ViewSet;
+    typedef std::set<TDEActionCollection *> ViewSet;
     ViewSet m_views;
 
     typedef std::stack<KCommand *> CommandStack;