summaryrefslogtreecommitdiffstats
path: root/src/gui/rulers
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/rulers')
-rw-r--r--src/gui/rulers/ControlRuler.cpp22
-rw-r--r--src/gui/rulers/ControlRuler.h6
-rw-r--r--src/gui/rulers/ControllerEventsRuler.cpp16
-rw-r--r--src/gui/rulers/ControllerEventsRuler.h4
-rw-r--r--src/gui/rulers/LoopRuler.cpp2
-rw-r--r--src/gui/rulers/MarkerRuler.cpp8
-rw-r--r--src/gui/rulers/MarkerRuler.h2
-rw-r--r--src/gui/rulers/PropertyControlRuler.cpp6
-rw-r--r--src/gui/rulers/PropertyControlRuler.h2
-rw-r--r--src/gui/rulers/TempoRuler.cpp14
-rw-r--r--src/gui/rulers/TempoRuler.h4
11 files changed, 43 insertions, 43 deletions
diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index c728093..ef61c50 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -62,11 +62,11 @@ const int ControlRuler::ItemHeightRange = 64;
ControlRuler::ControlRuler(Segment *segment,
RulerScale* rulerScale,
- EditViewBase* tqparentView,
+ EditViewBase* parentView,
TQCanvas* c, TQWidget* tqparent,
const char* name, WFlags f) :
RosegardenCanvasView(c, tqparent, name, f),
- m_tqparentEditView(tqparentView),
+ m_parentEditView(parentView),
m_mainHorizontalScrollBar(0),
m_rulerScale(rulerScale),
m_eventSelection(new EventSelection(*segment)),
@@ -89,7 +89,7 @@ ControlRuler::ControlRuler(Segment *segment,
setFixedHeight(tqsizeHint().height());
connect(this, TQT_SIGNAL(stateChange(const TQString&, bool)),
- m_tqparentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool)));
+ m_parentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool)));
m_numberFloat = new TextFloat(this);
m_numberFloat->hide();
@@ -127,13 +127,13 @@ void ControlRuler::slotUpdateElementsHPos()
ControlItem* item = dynamic_cast<ControlItem*>(*it);
if (!item)
continue;
- tqlayoutItem(item);
+ layoutItem(item);
}
canvas()->update();
}
-void ControlRuler::tqlayoutItem(ControlItem* item)
+void ControlRuler::layoutItem(ControlItem* item)
{
timeT itemTime = item->getElementAdapter()->getTime();
@@ -146,7 +146,7 @@ void ControlRuler::tqlayoutItem(ControlItem* item)
item->setWidth(width);
- // RG_DEBUG << "ControlRuler::tqlayoutItem ControlItem x = " << x << " - width = " << width << endl;
+ // RG_DEBUG << "ControlRuler::layoutItem ControlItem x = " << x << " - width = " << width << endl;
}
void ControlRuler::setControlTool(ControlTool* tool)
@@ -281,7 +281,7 @@ void ControlRuler::contentsMouseReleaseEvent(TQMouseEvent* e)
m_eventSelection->getEndTime());
RG_DEBUG << "ControlRuler::contentsMouseReleaseEvent : adding command\n";
- m_tqparentEditView->addCommandToHistory(command);
+ m_parentEditView->addCommandToHistory(command);
m_itemMoved = false;
}
@@ -310,7 +310,7 @@ void ControlRuler::contentsMouseMoveEvent(TQMouseEvent* e)
//
TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0));
- int scrollX = dynamic_cast<EditView*>(m_tqparentEditView)->getRawCanvasView()->
+ int scrollX = dynamic_cast<EditView*>(m_parentEditView)->getRawCanvasView()->
horizontalScrollBar()->value();
/*
@@ -393,10 +393,10 @@ void ControlRuler::createMenu()
{
RG_DEBUG << "ControlRuler::createMenu()\n";
- KMainWindow* tqparentMainWindow = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
+ KMainWindow* parentMainWindow = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
- if (tqparentMainWindow && tqparentMainWindow->factory()) {
- m_menu = static_cast<TQPopupMenu*>(tqparentMainWindow->factory()->container(m_menuName, tqparentMainWindow));
+ if (parentMainWindow && parentMainWindow->factory()) {
+ m_menu = static_cast<TQPopupMenu*>(parentMainWindow->factory()->container(m_menuName, parentMainWindow));
if (!m_menu) {
RG_DEBUG << "ControlRuler::createMenu() failed\n";
diff --git a/src/gui/rulers/ControlRuler.h b/src/gui/rulers/ControlRuler.h
index 8bdf200..8df6da1 100644
--- a/src/gui/rulers/ControlRuler.h
+++ b/src/gui/rulers/ControlRuler.h
@@ -70,7 +70,7 @@ class ControlRuler : public RosegardenCanvasView, public SegmentObserver
public:
ControlRuler(Segment*,
RulerScale*,
- EditViewBase* tqparentView,
+ EditViewBase* parentView,
TQCanvas*,
TQWidget* tqparent=0, const char* name=0, WFlags f=0);
virtual ~ControlRuler();
@@ -122,7 +122,7 @@ protected:
virtual void computeStaffOffset() {};
- virtual void tqlayoutItem(ControlItem*);
+ virtual void layoutItem(ControlItem*);
@@ -145,7 +145,7 @@ protected:
//--------------- Data members ---------------------------------
- EditViewBase* m_tqparentEditView;
+ EditViewBase* m_parentEditView;
TQScrollBar* m_mainHorizontalScrollBar;
RulerScale* m_rulerScale;
EventSelection* m_eventSelection;
diff --git a/src/gui/rulers/ControllerEventsRuler.cpp b/src/gui/rulers/ControllerEventsRuler.cpp
index 6fe95e6..acbdc65 100644
--- a/src/gui/rulers/ControllerEventsRuler.cpp
+++ b/src/gui/rulers/ControllerEventsRuler.cpp
@@ -57,12 +57,12 @@ namespace Rosegarden
ControllerEventsRuler::ControllerEventsRuler(Segment *segment,
RulerScale* rulerScale,
- EditViewBase* tqparentView,
+ EditViewBase* parentView,
TQCanvas* c,
TQWidget* tqparent,
const ControlParameter *controller,
const char* name, WFlags f)
- : ControlRuler(segment, rulerScale, tqparentView, c, tqparent, name, f),
+ : ControlRuler(segment, rulerScale, parentView, c, tqparent, name, f),
m_defaultItemWidth(20),
m_controlLine(new TQCanvasLine(canvas())),
m_controlLineShowing(false),
@@ -286,7 +286,7 @@ void ControllerEventsRuler::insertControllerEvent()
insertTime, number,
initialValue, *m_segment);
- m_tqparentEditView->addCommandToHistory(command);
+ m_parentEditView->addCommandToHistory(command);
}
void ControllerEventsRuler::eraseControllerEvent()
@@ -298,7 +298,7 @@ void ControllerEventsRuler::eraseControllerEvent()
*m_segment,
m_eventSelection->getStartTime(),
m_eventSelection->getEndTime());
- m_tqparentEditView->addCommandToHistory(command);
+ m_parentEditView->addCommandToHistory(command);
updateSelection();
}
@@ -329,7 +329,7 @@ void ControllerEventsRuler::clearControllerEvents()
}
EraseCommand *command = new EraseCommand(*es);
- m_tqparentEditView->addCommandToHistory(command);
+ m_parentEditView->addCommandToHistory(command);
}
@@ -425,7 +425,7 @@ void ControllerEventsRuler::contentsMouseMoveEvent(TQMouseEvent *e)
}
-void ControllerEventsRuler::tqlayoutItem(ControlItem* item)
+void ControllerEventsRuler::layoutItem(ControlItem* item)
{
timeT itemTime = item->getElementAdapter()->getTime();
@@ -440,7 +440,7 @@ void ControllerEventsRuler::tqlayoutItem(ControlItem* item)
item->setWidth(width);
- //RG_DEBUG << "ControllerEventsRuler::tqlayoutItem ControlItem x = " << x
+ //RG_DEBUG << "ControllerEventsRuler::layoutItem ControlItem x = " << x
//<< " - width = " << width << endl;
}
@@ -493,7 +493,7 @@ ControllerEventsRuler::tqdrawControlLine(timeT startTime,
time += quantDur;
}
- m_tqparentEditView->addCommandToHistory(macro);
+ m_parentEditView->addCommandToHistory(macro);
}
}
diff --git a/src/gui/rulers/ControllerEventsRuler.h b/src/gui/rulers/ControllerEventsRuler.h
index 877cf4e..56a858e 100644
--- a/src/gui/rulers/ControllerEventsRuler.h
+++ b/src/gui/rulers/ControllerEventsRuler.h
@@ -56,7 +56,7 @@ class ControllerEventsRuler : public ControlRuler
public:
ControllerEventsRuler(Segment*,
RulerScale*,
- EditViewBase* tqparentView,
+ EditViewBase* parentView,
TQCanvas*,
TQWidget* tqparent=0,
const ControlParameter *controller = 0,
@@ -94,7 +94,7 @@ protected:
virtual void contentsMouseReleaseEvent(TQMouseEvent*);
virtual void contentsMouseMoveEvent(TQMouseEvent*);
- virtual void tqlayoutItem(ControlItem*);
+ virtual void layoutItem(ControlItem*);
void tqdrawControlLine(timeT startTime,
timeT endTime,
diff --git a/src/gui/rulers/LoopRuler.cpp b/src/gui/rulers/LoopRuler.cpp
index fec733b..2d84890 100644
--- a/src/gui/rulers/LoopRuler.cpp
+++ b/src/gui/rulers/LoopRuler.cpp
@@ -71,7 +71,7 @@ LoopRuler::LoopRuler(RosegardenGUIDoc *doc,
{
/*
* I need to understand if this ruler is being built for the main
- * window (Track Editor) or for any of the segment editors. Aptqparently
+ * window (Track Editor) or for any of the segment editors. Apparently
* the name parameter is supplied (non-NULL) only for the main window.
* I can't find of any other (more decent) way to do this. Sorry.
*/
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index f572e64..f20cc73 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_tqparentMainWindow(dynamic_cast<KMainWindow*>(doc->tqparent()))
+ m_parentMainWindow(dynamic_cast<KMainWindow*>(doc->tqparent()))
{
// If the tqparent window has a main window above it, we need to use
// that as the tqparent main window, not the document's tqparent.
@@ -82,7 +82,7 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
// we're in.
TQObject *probe = TQT_TQOBJECT(tqparent);
while (probe && !dynamic_cast<KMainWindow *>(probe)) probe = probe->tqparent();
- if (probe) m_tqparentMainWindow = dynamic_cast<KMainWindow *>(probe);
+ if (probe) m_parentMainWindow = dynamic_cast<KMainWindow *>(probe);
// m_barFont = new TQFont("helvetica", 12);
// m_barFont->setPixelSize(12);
@@ -124,7 +124,7 @@ MarkerRuler::~MarkerRuler()
delete m_barFont;
// 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);
}
@@ -134,7 +134,7 @@ MarkerRuler::createMenu()
{
setXMLFile("markerruler.rc");
- KXMLGUIFactory* factory = m_tqparentMainWindow->factory();
+ KXMLGUIFactory* factory = m_parentMainWindow->factory();
factory->addClient(this);
TQWidget* tmp = factory->container("marker_ruler_menu", this);
diff --git a/src/gui/rulers/MarkerRuler.h b/src/gui/rulers/MarkerRuler.h
index 6d99d68..0dda828 100644
--- a/src/gui/rulers/MarkerRuler.h
+++ b/src/gui/rulers/MarkerRuler.h
@@ -112,7 +112,7 @@ protected:
RosegardenGUIDoc *m_doc;
RulerScale *m_rulerScale;
- KMainWindow* m_tqparentMainWindow;
+ KMainWindow* m_parentMainWindow;
};
diff --git a/src/gui/rulers/PropertyControlRuler.cpp b/src/gui/rulers/PropertyControlRuler.cpp
index 4a01cb0..d91a515 100644
--- a/src/gui/rulers/PropertyControlRuler.cpp
+++ b/src/gui/rulers/PropertyControlRuler.cpp
@@ -54,11 +54,11 @@ namespace Rosegarden
PropertyControlRuler::PropertyControlRuler(PropertyName propertyName,
Staff* staff,
RulerScale* rulerScale,
- EditViewBase* tqparentView,
+ EditViewBase* parentView,
TQCanvas* c, TQWidget* tqparent,
const char* name, WFlags f) :
ControlRuler(&(staff->getSegment()), rulerScale,
- tqparentView, c, tqparent, name, f),
+ parentView, c, tqparent, name, f),
m_propertyName(propertyName),
m_staff(staff),
m_propertyLine(new TQCanvasLine(canvas())),
@@ -391,7 +391,7 @@ PropertyControlRuler::drawPropertyLine(timeT startTime,
startValue,
endValue);
- m_tqparentEditView->addCommandToHistory(command);
+ m_parentEditView->addCommandToHistory(command);
} else {
diff --git a/src/gui/rulers/PropertyControlRuler.h b/src/gui/rulers/PropertyControlRuler.h
index 0db8446..704fabe 100644
--- a/src/gui/rulers/PropertyControlRuler.h
+++ b/src/gui/rulers/PropertyControlRuler.h
@@ -60,7 +60,7 @@ public:
PropertyControlRuler(PropertyName propertyName,
Staff*,
RulerScale*,
- EditViewBase* tqparentView,
+ EditViewBase* parentView,
TQCanvas*,
TQWidget* tqparent=0, const char* name=0, WFlags f=0);
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);
diff --git a/src/gui/rulers/TempoRuler.h b/src/gui/rulers/TempoRuler.h
index ce51213..f74d695 100644
--- a/src/gui/rulers/TempoRuler.h
+++ b/src/gui/rulers/TempoRuler.h
@@ -73,7 +73,7 @@ public:
*/
TempoRuler(RulerScale *rulerScale,
RosegardenGUIDoc *doc,
- KMainWindow *tqparentMainWindow,
+ KMainWindow *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_tqparentMainWindow;
+ KMainWindow *m_parentMainWindow;
TQFont m_font;
TQFont m_boldFont;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 06:51:47 +0000