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

1 files changed, 20 insertions, 20 deletions

diff --git a/src/gui/kdeext/QCanvasSimpleSprite.cpp b/src/gui/kdeext/QCanvasSimpleSprite.cpp
index 2b03c87..74d4366 100644
--- a/src/gui/kdeext/QCanvasSimpleSprite.cpp
+++ b/src/gui/kdeext/QCanvasSimpleSprite.cpp
@@ -69,7 +69,7 @@ QCanvasSimpleSprite::~QCanvasSimpleSprite()
 
     // We can't delete m_pixmapArray or we get a core dump.
     //
-    // The reason I think is that after the TQCanvasSprite is deleted,
+    // The reason I think is that after the QCanvasSprite is deleted,
     // it is removed from the TQCanvas, which therefore needs the
     // pixmaps to know how to update itself (the crash is in
     // TQCanvas::removeChunks(), usually).
@@ -82,13 +82,13 @@ QCanvasSimpleSprite::~QCanvasSimpleSprite()
 TQCanvasPixmapArray*
 QCanvasSimpleSprite::makePixmapArray(TQPixmap *pixmap)
 {
-    QList<TQPixmap> pixlist;
+    TQList<TQPixmap> pixlist;
     pixlist.setAutoDelete(true); // the TQCanvasPixmapArray creates its
     // own copies of the pixmaps, so we
     // can delete the one we're passed
     pixlist.append(pixmap);
 
-    QList<TQPoint> spotlist;
+    TQList<TQPoint> spotlist;
     spotlist.setAutoDelete(true);
     spotlist.append(new TQPoint(0, 0));
 
@@ -98,13 +98,13 @@ QCanvasSimpleSprite::makePixmapArray(TQPixmap *pixmap)
 TQCanvasPixmapArray*
 QCanvasSimpleSprite::makePixmapArray(TQCanvasPixmap *pixmap)
 {
-    QList<TQPixmap> pixlist;
+    TQList<TQPixmap> pixlist;
     pixlist.setAutoDelete(true); // the TQCanvasPixmapArray creates its
     // own copies of the pixmaps, so we
     // can delete the one we're passed
     pixlist.append(pixmap);
 
-    QList<TQPoint> spotlist;
+    TQList<TQPoint> spotlist;
     spotlist.setAutoDelete(true);
     spotlist.append(new TQPoint(pixmap->offsetX(), pixmap->offsetY()));
 
@@ -119,14 +119,14 @@ QCanvasSimpleSprite::makePixmapArray(const TQString &pixmapfile)
 
 //////////////////////////////////////////////////////////////////////
 
-QCanvasNotationSprite::QCanvasNotationSprite(NotationElement& n,
+TQCanvasNotationSprite::TQCanvasNotationSprite(NotationElement& n,
         TQPixmap* pixmap,
         TQCanvas* canvas)
         : QCanvasSimpleSprite(pixmap, canvas),
         m_notationElement(n)
 {}
 
-QCanvasNotationSprite::QCanvasNotationSprite(NotationElement& n,
+TQCanvasNotationSprite::TQCanvasNotationSprite(NotationElement& n,
         TQCanvasPixmap* pixmap,
         TQCanvas* canvas)
         : QCanvasSimpleSprite(pixmap, canvas),
@@ -134,49 +134,49 @@ QCanvasNotationSprite::QCanvasNotationSprite(NotationElement& n,
 
 {}
 
-QCanvasNotationSprite::~QCanvasNotationSprite()
+TQCanvasNotationSprite::~TQCanvasNotationSprite()
 {}
 
 
-QCanvasNonElementSprite::QCanvasNonElementSprite(TQPixmap *pixmap,
+TQCanvasNonElementSprite::TQCanvasNonElementSprite(TQPixmap *pixmap,
         TQCanvas *canvas) :
         QCanvasSimpleSprite(pixmap, canvas)
 {}
 
-QCanvasNonElementSprite::QCanvasNonElementSprite(TQCanvasPixmap *pixmap,
+TQCanvasNonElementSprite::TQCanvasNonElementSprite(TQCanvasPixmap *pixmap,
         TQCanvas *canvas) :
         QCanvasSimpleSprite(pixmap, canvas)
 {}
 
-QCanvasNonElementSprite::~QCanvasNonElementSprite()
+TQCanvasNonElementSprite::~TQCanvasNonElementSprite()
 {}
 
-QCanvasTimeSigSprite::QCanvasTimeSigSprite(double layoutX,
+TQCanvasTimeSigSprite::TQCanvasTimeSigSprite(double tqlayoutX,
         TQPixmap *pixmap,
         TQCanvas *canvas) :
-        QCanvasNonElementSprite(pixmap, canvas),
-        m_layoutX(layoutX)
+        TQCanvasNonElementSprite(pixmap, canvas),
+        m_tqlayoutX(tqlayoutX)
 {}
 
-QCanvasTimeSigSprite::QCanvasTimeSigSprite(double layoutX,
+TQCanvasTimeSigSprite::TQCanvasTimeSigSprite(double tqlayoutX,
         TQCanvasPixmap *pixmap,
         TQCanvas *canvas) :
-        QCanvasNonElementSprite(pixmap, canvas),
-        m_layoutX(layoutX)
+        TQCanvasNonElementSprite(pixmap, canvas),
+        m_tqlayoutX(tqlayoutX)
 {}
 
-QCanvasTimeSigSprite::~QCanvasTimeSigSprite()
+TQCanvasTimeSigSprite::~TQCanvasTimeSigSprite()
 {}
 
 
 QCanvasStaffNameSprite::QCanvasStaffNameSprite(TQPixmap *pixmap,
         TQCanvas *canvas) :
-        QCanvasNonElementSprite(pixmap, canvas)
+        TQCanvasNonElementSprite(pixmap, canvas)
 {}
 
 QCanvasStaffNameSprite::QCanvasStaffNameSprite(TQCanvasPixmap *pixmap,
         TQCanvas *canvas) :
-        QCanvasNonElementSprite(pixmap, canvas)
+        TQCanvasNonElementSprite(pixmap, canvas)
 {}
 
 QCanvasStaffNameSprite::~QCanvasStaffNameSprite()