From 458efa7b0c935cbaafa2791021a5f8f7241aa876 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 2 May 2011 22:38:52 +0000 Subject: Initial TQt4 port of Rosegarden This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/gui/rulers/ControlRuler.cpp | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/gui/rulers/ControlRuler.cpp') diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp index 7fea1fc..c728093 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* parentView, - TQCanvas* c, TQWidget* parent, + EditViewBase* tqparentView, + TQCanvas* c, TQWidget* tqparent, const char* name, WFlags f) : - RosegardenCanvasView(c, parent, name, f), - m_parentEditView(parentView), + RosegardenCanvasView(c, tqparent, name, f), + m_tqparentEditView(tqparentView), m_mainHorizontalScrollBar(0), m_rulerScale(rulerScale), m_eventSelection(new EventSelection(*segment)), @@ -84,12 +84,12 @@ ControlRuler::ControlRuler(Segment *segment, { setHScrollBarMode(TQScrollView::AlwaysOff); - m_selectionRect->setPen(Qt::red); + m_selectionRect->setPen(TQt::red); - setFixedHeight(sizeHint().height()); + setFixedHeight(tqsizeHint().height()); connect(this, TQT_SIGNAL(stateChange(const TQString&, bool)), - m_parentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool))); + m_tqparentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool))); m_numberFloat = new TextFloat(this); m_numberFloat->hide(); @@ -113,7 +113,7 @@ void ControlRuler::slotUpdate() canvas()->setAllChanged(); // TODO: be a bit more subtle, call setChanged(