summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/segment/segmentcanvas
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors/segment/segmentcanvas')
-rw-r--r--src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionModel.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionView.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentEraser.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentJoiner.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentMover.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentPencil.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentResizer.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentSelector.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentSplitter.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentToolBox.h2
12 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h
index 697259b..71b2546 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h
@@ -48,7 +48,7 @@ class AudioPreviewThread;
class AudioPreviewUpdater : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
AudioPreviewUpdater(AudioPreviewThread &thread,
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModel.h b/src/gui/editors/segment/segmentcanvas/CompositionModel.h
index 1e4bd2f..6fe1952 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionModel.h
+++ b/src/gui/editors/segment/segmentcanvas/CompositionModel.h
@@ -56,7 +56,7 @@ typedef std::vector<TQImage> PixmapArray;
class CompositionModel : public TQObject, public CompositionObserver, public SegmentObserver
{
Q_OBJECT
- TQ_OBJECT
+
public:
struct CompositionItemCompare {
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h
index f2998c3..25092c4 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h
+++ b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h
@@ -62,7 +62,7 @@ class AudioPreviewThread;
class CompositionModelImpl : public CompositionModel
{
Q_OBJECT
- TQ_OBJECT
+
public:
CompositionModelImpl(Composition& compo,
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.h b/src/gui/editors/segment/segmentcanvas/CompositionView.h
index a1f6f07..0592cfc 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.h
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.h
@@ -64,7 +64,7 @@ class CompositionRect;
class CompositionView : public RosegardenScrollView
{
Q_OBJECT
- TQ_OBJECT
+
public:
CompositionView(RosegardenGUIDoc*, CompositionModel*,
TQWidget * parent=0, const char* name=0, WFlags f=0);
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentEraser.h b/src/gui/editors/segment/segmentcanvas/SegmentEraser.h
index e3bb6b5..c45ea75 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentEraser.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentEraser.h
@@ -43,7 +43,7 @@ class CompositionView;
class SegmentEraser : public SegmentTool
{
Q_OBJECT
- TQ_OBJECT
+
friend class SegmentToolBox;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentJoiner.h b/src/gui/editors/segment/segmentcanvas/SegmentJoiner.h
index f2fd935..c1b3b0c 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentJoiner.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentJoiner.h
@@ -43,7 +43,7 @@ class CompositionView;
class SegmentJoiner : public SegmentTool
{
Q_OBJECT
- TQ_OBJECT
+
friend class SegmentToolBox;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentMover.h b/src/gui/editors/segment/segmentcanvas/SegmentMover.h
index 882647e..e247f1d 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentMover.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentMover.h
@@ -44,7 +44,7 @@ class CompositionView;
class SegmentMover : public SegmentTool
{
Q_OBJECT
- TQ_OBJECT
+
friend class SegmentToolBox;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentPencil.h b/src/gui/editors/segment/segmentcanvas/SegmentPencil.h
index 894babf..dc8fae4 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentPencil.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentPencil.h
@@ -47,7 +47,7 @@ class CompositionView;
class SegmentPencil : public SegmentTool
{
Q_OBJECT
- TQ_OBJECT
+
friend class SegmentToolBox;
friend class SegmentSelector;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentResizer.h b/src/gui/editors/segment/segmentcanvas/SegmentResizer.h
index 809dc34..416c6cf 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentResizer.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentResizer.h
@@ -48,7 +48,7 @@ class CompositionView;
class SegmentResizer : public SegmentTool
{
Q_OBJECT
- TQ_OBJECT
+
friend class SegmentToolBox;
friend class SegmentSelector;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.h b/src/gui/editors/segment/segmentcanvas/SegmentSelector.h
index db572d0..ad61628 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.h
@@ -44,7 +44,7 @@ class CompositionView;
class SegmentSelector : public SegmentTool
{
Q_OBJECT
- TQ_OBJECT
+
friend class SegmentToolBox;
friend class SegmentTool;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSplitter.h b/src/gui/editors/segment/segmentcanvas/SegmentSplitter.h
index a2fc1f6..8124edc 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSplitter.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSplitter.h
@@ -45,7 +45,7 @@ class CompositionView;
class SegmentSplitter : public SegmentTool
{
Q_OBJECT
- TQ_OBJECT
+
friend class SegmentToolBox;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h
index 92306f3..2cddc97 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h
@@ -43,7 +43,7 @@ class CompositionView;
class SegmentToolBox : public BaseToolBox
{
Q_OBJECT
- TQ_OBJECT
+
public:
SegmentToolBox(CompositionView* parent, RosegardenGUIDoc*);