diff options
Diffstat (limited to 'src/gui/rulers/TempoRuler.cpp')
| -rw-r--r-- | src/gui/rulers/TempoRuler.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp index f5f600a..9928541 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 *tqparentMainWindow, + KMainWindow *parentMainWindow, double xorigin, int height, bool small, @@ -96,7 +96,7 @@ TempoRuler::TempoRuler(RulerScale *rulerScale, m_composition(&doc->getComposition()), m_rulerScale(rulerScale), m_menu(0), - m_tqparentMainWindow(tqparentMainWindow), + m_parentMainWindow(parentMainWindow), m_fontMetrics(m_boldFont) { // m_font.setPointSize(m_small ? 9 : 11); @@ -165,7 +165,7 @@ TempoRuler::~TempoRuler() { // we have to do this so that the menu is re-created properly // when the main window is itself recreated (on a File->New for instance) - KXMLGUIFactory* factory = m_tqparentMainWindow->factory(); + KXMLGUIFactory* factory = m_parentMainWindow->factory(); if (factory) factory->removeClient(this); } @@ -614,12 +614,12 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target, // std::cerr << "cp = " << cp.x() << "," << cp.y() << ", tempo = " << qpm << std::endl; TQPoint mp = cp + pos(); - TQWidget *tqparent = tqparentWidget(); - while (tqparent->tqparentWidget() && + TQWidget *tqparent = parentWidget(); + while (tqparent->parentWidget() && !tqparent->isTopLevel() && !tqparent->isDialog()) { mp += tqparent->pos(); - tqparent = tqparent->tqparentWidget(); + tqparent = tqparent->parentWidget(); } int yoff = cp.y() + m_textFloat->height() + 3; @@ -1074,7 +1074,7 @@ TempoRuler::createMenu() { setXMLFile("temporuler.rc"); - KXMLGUIFactory* factory = m_tqparentMainWindow->factory(); + KXMLGUIFactory* factory = m_parentMainWindow->factory(); factory->addClient(this); TQWidget* tmp = factory->container("tempo_ruler_menu", this); |