Rename a number of classes to enhance compatibility with KDE4

5 files changed, 22 insertions, 22 deletions

diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index e9db070..f1dd4e7 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -393,7 +393,7 @@ void ControlRuler::createMenu()
 {
     RG_DEBUG << "ControlRuler::createMenu()\n";
 
-    KMainWindow* parentMainWindow = dynamic_cast<KMainWindow*>(topLevelWidget());
+    TDEMainWindow* parentMainWindow = dynamic_cast<TDEMainWindow*>(topLevelWidget());
 
     if (parentMainWindow && parentMainWindow->factory()) {
         m_menu = static_cast<TQPopupMenu*>(parentMainWindow->factory()->container(m_menuName, parentMainWindow));
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index f2c76a6..af8c27f 100644
--- a/src/gui/rulers/MarkerRuler.cpp
+++ b/src/gui/rulers/MarkerRuler.cpp
@@ -73,7 +73,7 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
         m_menu(0),
         m_doc(doc),
         m_rulerScale(rulerScale),
-        m_parentMainWindow(dynamic_cast<KMainWindow*>(doc->parent()))
+        m_parentMainWindow(dynamic_cast<TDEMainWindow*>(doc->parent()))
 {
     // If the parent window has a main window above it, we need to use
     // that as the parent main window, not the document's parent.
@@ -81,8 +81,8 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
     // (document-level) action collection regardless of which window
     // we're in.
     TQObject *probe = TQT_TQOBJECT(parent);
-    while (probe && !dynamic_cast<KMainWindow *>(probe)) probe = probe->parent();
-    if (probe) m_parentMainWindow = dynamic_cast<KMainWindow *>(probe);
+    while (probe && !dynamic_cast<TDEMainWindow *>(probe)) probe = probe->parent();
+    if (probe) m_parentMainWindow = dynamic_cast<TDEMainWindow *>(probe);
 
     //    m_barFont = new TQFont("helvetica", 12);
     //    m_barFont->setPixelSize(12);
@@ -97,21 +97,21 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
     // don't become more event-specific in future...
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert.png"));
-    new KAction(i18n("Insert Marker"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Insert Marker"), icon, 0, TQT_TQOBJECT(this),
              TQT_SLOT(slotInsertMarkerHere()), actionCollection(),
              "insert_marker_here");
     
-    new KAction(i18n("Insert Marker at Playback Position"), 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Insert Marker at Playback Position"), 0, TQT_TQOBJECT(this),
              TQT_SLOT(slotInsertMarkerAtPointer()), actionCollection(),
              "insert_marker_at_pointer");
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png"));
-    new KAction(i18n("Delete Marker"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Delete Marker"), icon, 0, TQT_TQOBJECT(this),
              TQT_SLOT(slotDeleteMarker()), actionCollection(),
              "delete_marker");
     
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png"));
-    new KAction(i18n("Edit Marker..."), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Edit Marker..."), icon, 0, TQT_TQOBJECT(this),
                  TQT_SLOT(slotEditMarker()), actionCollection(),
                  "edit_marker");
 
diff --git a/src/gui/rulers/MarkerRuler.h b/src/gui/rulers/MarkerRuler.h
index c121285..ff261d5 100644
--- a/src/gui/rulers/MarkerRuler.h
+++ b/src/gui/rulers/MarkerRuler.h
@@ -37,7 +37,7 @@ class TQPaintEvent;
 class TQMouseEvent;
 class TQFont;
 class TQPopupMenu;
-class KMainWindow;
+class TDEMainWindow;
 
 namespace Rosegarden
 {
@@ -112,7 +112,7 @@ protected:
     
     RosegardenGUIDoc *m_doc;
     RulerScale *m_rulerScale;
-    KMainWindow* m_parentMainWindow;
+    TDEMainWindow* m_parentMainWindow;
 
 };
 
diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp
index 9a16467..6f9fe65 100644
--- a/src/gui/rulers/TempoRuler.cpp
+++ b/src/gui/rulers/TempoRuler.cpp
@@ -66,7 +66,7 @@ namespace Rosegarden
 
 TempoRuler::TempoRuler(RulerScale *rulerScale,
                        RosegardenGUIDoc *doc,
-                       KMainWindow *parentMainWindow,
+                       TDEMainWindow *parentMainWindow,
                        double xorigin,
                        int height,
                        bool small,
@@ -124,37 +124,37 @@ TempoRuler::TempoRuler(RulerScale *rulerScale,
     TQIconSet icon;
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png"));
-    new KAction(i18n("Insert Tempo Change"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Insert Tempo Change"), icon, 0, TQT_TQOBJECT(this),
                  TQT_SLOT(slotInsertTempoHere()), actionCollection(),
                  "insert_tempo_here");
 
-    new KAction(i18n("Insert Tempo Change at Playback Position"), 0, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Insert Tempo Change at Playback Position"), 0, 0, TQT_TQOBJECT(this),
                  TQT_SLOT(slotInsertTempoAtPointer()), actionCollection(),
                  "insert_tempo_at_pointer");
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png"));
-    new KAction(i18n("Delete Tempo Change"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Delete Tempo Change"), icon, 0, TQT_TQOBJECT(this),
                  TQT_SLOT(slotDeleteTempoChange()), actionCollection(),
                  "delete_tempo");
 
-    new KAction(i18n("Ramp Tempo to Next Tempo"), 0, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Ramp Tempo to Next Tempo"), 0, 0, TQT_TQOBJECT(this),
                  TQT_SLOT(slotRampToNext()), actionCollection(),
                  "ramp_to_next");
 
-    new KAction(i18n("Un-Ramp Tempo"), 0, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Un-Ramp Tempo"), 0, 0, TQT_TQOBJECT(this),
                  TQT_SLOT(slotUnramp()), actionCollection(),
                  "unramp");
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png"));
-    new KAction(i18n("Edit Tempo..."), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Edit Tempo..."), icon, 0, TQT_TQOBJECT(this),
                  TQT_SLOT(slotEditTempo()), actionCollection(),
                  "edit_tempo");
 
-    new KAction(i18n("Edit Time Signature..."), 0, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Edit Time Signature..."), 0, 0, TQT_TQOBJECT(this),
                  TQT_SLOT(slotEditTimeSignature()), actionCollection(),
                  "edit_time_signature");
 
-    new KAction(i18n("Open Tempo and Time Signature Editor"), 0, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Open Tempo and Time Signature Editor"), 0, 0, TQT_TQOBJECT(this),
                  TQT_SLOT(slotEditTempos()), actionCollection(),
                  "edit_tempos");
 
diff --git a/src/gui/rulers/TempoRuler.h b/src/gui/rulers/TempoRuler.h
index e330839..bd395df 100644
--- a/src/gui/rulers/TempoRuler.h
+++ b/src/gui/rulers/TempoRuler.h
@@ -41,7 +41,7 @@ class TQPopupMenu;
 class TQPaintEvent;
 class TQMouseEvent;
 class TQEvent;
-class KMainWindow;
+class TDEMainWindow;
 
 
 namespace Rosegarden
@@ -73,7 +73,7 @@ public:
      */
     TempoRuler(RulerScale *rulerScale,
                RosegardenGUIDoc *doc,
-               KMainWindow *parentMainWindow,
+               TDEMainWindow *parentMainWindow,
                double xorigin = 0.0,
                int height = 0,
                bool small = false,
@@ -167,7 +167,7 @@ private:
     RulerScale *m_rulerScale;
     TextFloat *m_textFloat;
     TQPopupMenu *m_menu;
-    KMainWindow *m_parentMainWindow;
+    TDEMainWindow *m_parentMainWindow;
 
     TQFont m_font;
     TQFont m_boldFont;