From 11f31c37e5fa4889d9989f10272f44845449cb7b Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 6 Sep 2010 20:59:29 +0000 Subject: Initial TQt conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1172292 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../segment/segmentcanvas/CompositionModel.h | 46 +++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'src/gui/editors/segment/segmentcanvas/CompositionModel.h') diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModel.h b/src/gui/editors/segment/segmentcanvas/CompositionModel.h index beafc2e..63412c0 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionModel.h +++ b/src/gui/editors/segment/segmentcanvas/CompositionModel.h @@ -29,11 +29,11 @@ #include "base/Composition.h" #include "base/Segment.h" #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include "base/Event.h" @@ -50,10 +50,10 @@ namespace Rosegarden { class SnapGrid; -typedef std::vector PixmapArray; +typedef std::vector PixmapArray; -class CompositionModel : public QObject, public CompositionObserver, public SegmentObserver +class CompositionModel : public TQObject, public CompositionObserver, public SegmentObserver { Q_OBJECT public: @@ -62,17 +62,17 @@ public: bool operator()(const CompositionItem &c1, const CompositionItem &c2) const; }; - typedef std::vector rectlist; + typedef std::vector rectlist; typedef std::vector heightlist; typedef std::vector rectcontainer; typedef std::set itemcontainer; struct AudioPreviewDrawDataItem { - AudioPreviewDrawDataItem(PixmapArray p, QPoint bp, QRect r) : + AudioPreviewDrawDataItem(PixmapArray p, TQPoint bp, TQRect r) : pixmap(p), basePoint(bp), rect(r), resizeOffset(0) {}; PixmapArray pixmap; - QPoint basePoint; - QRect rect; + TQPoint basePoint; + TQRect rect; // when showing a segment that is being resized from the // beginning, this contains the offset between the current @@ -84,8 +84,8 @@ public: struct RectRange { std::pair range; - QPoint basePoint; - QColor color; + TQPoint basePoint; + TQColor color; }; typedef std::vector RectRanges; @@ -104,14 +104,14 @@ public: const std::vector &getValues() const { return m_values; } void setValues(const std::vector&v) { m_values = v; } - QRect getSegmentRect() { return m_segmentRect; } - void setSegmentRect(const QRect& r) { m_segmentRect = r; } + TQRect getSegmentRect() { return m_segmentRect; } + void setSegmentRect(const TQRect& r) { m_segmentRect = r; } protected: std::vector m_values; bool m_showMinima; unsigned int m_channels; - QRect m_segmentRect; + TQRect m_segmentRect; private: // no copy ctor @@ -122,13 +122,13 @@ public: virtual ~CompositionModel() {}; virtual unsigned int getNbRows() = 0; - virtual const rectcontainer& getRectanglesIn(const QRect& rect, + virtual const rectcontainer& getRectanglesIn(const TQRect& rect, RectRanges* notationRects, AudioPreviewDrawData* audioRects) = 0; - virtual heightlist getTrackDividersIn(const QRect& rect) = 0; + virtual heightlist getTrackDividersIn(const TQRect& rect) = 0; - virtual itemcontainer getItemsAt (const QPoint&) = 0; - virtual timeT getRepeatTimeAt (const QPoint&, const CompositionItem&) = 0; + virtual itemcontainer getItemsAt (const TQPoint&) = 0; + virtual timeT getRepeatTimeAt (const TQPoint&, const CompositionItem&) = 0; virtual SnapGrid& grid() = 0; @@ -140,9 +140,9 @@ public: virtual bool haveSelection() const = 0; virtual bool haveMultipleSelection() const = 0; virtual void signalSelection() = 0; - virtual void setSelectionRect(const QRect&) = 0; + virtual void setSelectionRect(const TQRect&) = 0; virtual void finalizeSelectionRect() = 0; - virtual QRect getSelectionContentsRect() = 0; + virtual TQRect getSelectionContentsRect() = 0; virtual void signalContentChange() = 0; virtual void addRecordingItem(const CompositionItem&) = 0; @@ -163,7 +163,7 @@ public: signals: void needContentUpdate(); - void needContentUpdate(const QRect&); + void needContentUpdate(const TQRect&); void needArtifactsUpdate(); protected: -- cgit v1.2.3