[Traverso-commit] traverso/src/traverso/songcanvas AudioClipView....

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/07 11:09:00

Modified files:
        src/traverso/songcanvas: AudioClipView.cpp CurveView.cpp 
                                 PluginChainView.cpp SongView.cpp 
                                 SongWidget.cpp TimeLineView.cpp 
                                 TrackPanelView.cpp 

Log message:
        * get rid of those qgraphicsitem allready added to scene messages when 
compiled with qt 4.3

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.cpp?cvsroot=traverso&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/PluginChainView.cpp?cvsroot=traverso&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongWidget.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelView.cpp?cvsroot=traverso&r1=1.23&r2=1.24

Patches:
Index: AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- AudioClipView.cpp   6 May 2007 22:05:17 -0000       1.59
+++ AudioClipView.cpp   7 May 2007 11:09:00 -0000       1.60
@@ -60,7 +60,10 @@
        setZValue(parent->zValue() + 1);
        
        m_sv = sv;
+
+#if QT_VERSION < 0x040300
        m_tv->scene()->addItem(this);
+#endif
        
        load_theme_data();
        create_clipinfo_string();
@@ -575,7 +578,9 @@
        PENTER;
        FadeView* view = new FadeView(m_sv, this, fade);
        m_fadeViews.append(view);
+#if QT_VERSION < 0x040300
        scene()->addItem(view);
+#endif
 }
 
 void AudioClipView::remove_fadeview( FadeCurve * fade )

Index: CurveView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- CurveView.cpp       3 May 2007 17:51:07 -0000       1.46
+++ CurveView.cpp       7 May 2007 11:09:00 -0000       1.47
@@ -178,8 +178,9 @@
        setZValue(parentViewItem->zValue() + 1);
        
        m_sv = sv;
+#if QT_VERSION < 0x040300
        m_sv->scene()->addItem(this);
-
+#endif
        load_theme_data();
        
        m_blinkColorDirection = 1;
@@ -302,7 +303,9 @@
 void CurveView::add_curvenode_view(CurveNode* node)
 {
        CurveNodeView* nodeview = new CurveNodeView(m_sv, this, node, 
m_guicurve);
+#if QT_VERSION < 0x040300
        m_sv->scene()->addItem(nodeview);
+#endif
        m_nodeViews.append(nodeview);
        
        AddRemove* cmd = (AddRemove*) m_guicurve->add_node(nodeview, false);

Index: PluginChainView.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/songcanvas/PluginChainView.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- PluginChainView.cpp 25 Apr 2007 17:50:47 -0000      1.11
+++ PluginChainView.cpp 7 May 2007 11:09:00 -0000       1.12
@@ -52,7 +52,9 @@
        
        setZValue(parent->zValue() + 2);
        
+#if QT_VERSION < 0x040300
        parent->scene()->addItem(this);
+#endif
        m_boundingRect = QRectF(0, 0, 0, 44);
        
        hide();
@@ -78,7 +80,9 @@
 void PluginChainView::add_new_pluginview( Plugin * plugin )
 {
        PluginView* view = new PluginView(this, m_pluginchain, plugin, 
m_pluginViews.size());
+#if QT_VERSION < 0x040300
        scene()->addItem(view);
+#endif
        
        int x = 6;
        foreach(PluginView* view, m_pluginViews) {

Index: SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- SongView.cpp        7 May 2007 10:31:21 -0000       1.46
+++ SongView.cpp        7 May 2007 11:09:00 -0000       1.47
@@ -15,7 +15,7 @@
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-11  USA.
 
 */
 

Index: SongWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongWidget.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- SongWidget.cpp      7 May 2007 10:31:21 -0000       1.15
+++ SongWidget.cpp      7 May 2007 11:09:00 -0000       1.16
@@ -141,7 +141,9 @@
        scene->addItem(this);
        m_gainview = new SongPanelGain(this, m_song);
        m_gainview->setPos(10, 16);
+#if QT_VERSION < 0x040300
        scene->addItem(m_gainview);
+#endif
        m_boundingRect = QRectF(0, 0, 200, TIMELINE_HEIGHT);
 }
 

Index: TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- TimeLineView.cpp    7 May 2007 10:31:22 -0000       1.27
+++ TimeLineView.cpp    7 May 2007 11:09:00 -0000       1.28
@@ -192,8 +192,9 @@
        m_timeline = m_sv->get_song()->get_timeline();
        m_samplerate = pm().get_project()->get_rate();
        
+#if QT_VERSION < 0x040300
        view->scene()->addItem(this);
-       
+#endif
        load_theme_data();
        
        // Create MarkerViews for existing markers
@@ -301,7 +302,9 @@
        MarkerView* view = new MarkerView(marker, m_sv, this);
        view->set_active(false);
        m_markerViews.append(view);
+#if QT_VERSION < 0x040300
        m_sv->scene()->addItem(view);
+#endif
        update();
 }
 

Index: TrackPanelView.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/songcanvas/TrackPanelView.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- TrackPanelView.cpp  7 May 2007 10:31:22 -0000       1.23
+++ TrackPanelView.cpp  7 May 2007 11:09:00 -0000       1.24
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: TrackPanelView.cpp,v 1.23 2007/05/07 10:31:22 r_sijrier Exp $
+$Id: TrackPanelView.cpp,v 1.24 2007/05/07 11:09:00 r_sijrier Exp $
 */
 
 #include <QGraphicsScene>
@@ -49,25 +49,16 @@
        m_viewPort = m_tv->get_songview()->get_trackpanel_view_port();
        m_track = m_tv->get_track();
        
-       m_viewPort->scene()->addItem(this);
-       
        m_gainView = new TrackPanelGain(this, m_track);
        m_gainView->set_width(m_viewPort->width() - 20);
-       m_viewPort->scene()->addItem(m_gainView);
        
        m_panView = new TrackPanelPan(this, m_track);
        m_panView->set_width(m_viewPort->width() - 20);
-       m_viewPort->scene()->addItem(m_panView);
        
        recLed = new TrackPanelLed(this, "rec", "toggle_arm");
        soloLed = new TrackPanelLed(this, "solo", "solo");
        muteLed = new TrackPanelLed(this, "mute", "mute");
        
-       m_viewPort->scene()->addItem(recLed);
-       m_viewPort->scene()->addItem(soloLed);
-       m_viewPort->scene()->addItem(muteLed);
-       
-
        m_fontName = QApplication::font();
        m_fontName.setPointSize(int(m_fontName.pointSize() * 
themer()->get_property("TrackPanel:name:fontscale", 0.9).toDouble()));
 
@@ -84,8 +75,17 @@
        inBus = new TrackPanelBus(this, m_track, TrackPanelBus::BUSIN);
        outBus = new TrackPanelBus(this, m_track, TrackPanelBus::BUSOUT);
        
+       m_viewPort->scene()->addItem(this);
+
+#if QT_VERSION < 0x040300
+       m_viewPort->scene()->addItem(m_gainView);
+       m_viewPort->scene()->addItem(m_panView);
+       m_viewPort->scene()->addItem(recLed);
+       m_viewPort->scene()->addItem(soloLed);
+       m_viewPort->scene()->addItem(muteLed);
        m_viewPort->scene()->addItem(inBus);
        m_viewPort->scene()->addItem(outBus);
+#endif
        
        m_boundingRect = QRectF(0, 0, 200, m_track->get_height());