[Traverso-commit] traverso/src core/ViewPort.cpp traverso/songcan...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/12 12:48:17

Modified files:
        src/core       : ViewPort.cpp 
        src/traverso/songcanvas: AudioClipView.cpp ClipsViewPort.cpp 
                                 PositionIndicator.cpp 

Log message:
        compile warning fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ViewPort.cpp?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/ClipsViewPort.cpp?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/PositionIndicator.cpp?cvsroot=traverso&r1=1.2&r2=1.3

Patches:
Index: core/ViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ViewPort.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- core/ViewPort.cpp   12 Apr 2007 12:32:07 -0000      1.13
+++ core/ViewPort.cpp   12 Apr 2007 12:48:17 -0000      1.14
@@ -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: ViewPort.cpp,v 1.13 2007/04/12 12:32:07 r_sijrier Exp $
+$Id: ViewPort.cpp,v 1.14 2007/04/12 12:48:17 r_sijrier Exp $
 */
 
 #include <QMouseEvent>
@@ -261,8 +261,8 @@
 void HoldCursor::paint( QPainter * painter, const QStyleOptionGraphicsItem * 
option, QWidget * widget )
 {
        Q_UNUSED(widget);
+       Q_UNUSED(option);
 
-//     printf("HoldCursor:: exposed rect is: x=%f, y=%f, w=%f, h=%f\n", 
option->exposedRect.x(), option->exposedRect.y(), option->exposedRect.width(), 
option->exposedRect.height());
        
        painter->drawPixmap(0, 0, m_pixmap);
        
@@ -287,8 +287,8 @@
 void HoldCursor::set_type( const QString & type )
 {
        m_pixmap = find_pixmap(type);
-       int x = pos().x();
-       int y = pos().y();
+       int x = (int) pos().x();
+       int y = (int) pos().y();
        setPos(x - m_pixmap.width() / 2, y - m_pixmap.height() / 2);
 }
 

Index: traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- traverso/songcanvas/AudioClipView.cpp       12 Apr 2007 12:32:07 -0000      
1.39
+++ traverso/songcanvas/AudioClipView.cpp       12 Apr 2007 12:48:17 -0000      
1.40
@@ -203,7 +203,7 @@
        }
        
        if (m_dragging) {
-               m_posIndicator->set_value(frame_to_smpte(x() * 
m_sv->scalefactor, m_song->get_rate()));
+               m_posIndicator->set_value(frame_to_smpte( (nframes_t)(x() * 
m_sv->scalefactor), m_song->get_rate()));
        }
        
        painter->restore();
@@ -666,8 +666,9 @@
        peak->start_peak_loading();
 }
 
-void AudioClipView::hoverEnterEvent(QGraphicsSceneHoverEvent * event)
+void AudioClipView::hoverEnterEvent(QGraphicsSceneHoverEvent* event)
 {
+       Q_UNUSED(event)
        if (ie().is_holding()) {
                return;
        }
@@ -715,7 +716,7 @@
        nframes_t newPos = m_clip->get_length();
        m_boundingRect = QRectF(0, 0, (newPos / m_sv->scalefactor), m_height);
        
-       QRect updaterect = QRect(m_oldRecordingPos, 0, newPos, 
m_boundingRect.height());
+       QRect updaterect = QRect(m_oldRecordingPos, 0, newPos, 
(int)m_boundingRect.height());
        update(updaterect);
        
        m_oldRecordingPos = newPos;

Index: traverso/songcanvas/ClipsViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/ClipsViewPort.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- traverso/songcanvas/ClipsViewPort.cpp       2 Apr 2007 21:05:43 -0000       
1.12
+++ traverso/songcanvas/ClipsViewPort.cpp       12 Apr 2007 12:48:17 -0000      
1.13
@@ -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: ClipsViewPort.cpp,v 1.12 2007/04/02 21:05:43 r_sijrier Exp $
+$Id: ClipsViewPort.cpp,v 1.13 2007/04/12 12:48:17 r_sijrier Exp $
 */
 
 #include "ClipsViewPort.h"
@@ -107,8 +107,10 @@
        }
 }
 
-void ClipsViewPort::dropEvent( QDropEvent * event )
+void ClipsViewPort::dropEvent(QDropEvent* event )
 {
+       Q_UNUSED(event)
+       
        if (!importTrack) {
                return;
        }
@@ -126,6 +128,8 @@
 
 void ClipsViewPort::dragMoveEvent( QDragMoveEvent * event )
 {
+       Q_UNUSED(event)
+                       
        Project* project = pm().get_project();
        if (!project) {
                return;

Index: traverso/songcanvas/PositionIndicator.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/songcanvas/PositionIndicator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- traverso/songcanvas/PositionIndicator.cpp   10 Apr 2007 19:37:57 -0000      
1.2
+++ traverso/songcanvas/PositionIndicator.cpp   12 Apr 2007 12:48:17 -0000      
1.3
@@ -47,7 +47,7 @@
        prepareGeometryChange();
        m_boundingRect = QRectF(0, 0, 65, 14);
        
-       m_background = QPixmap(m_boundingRect.width(), m_boundingRect.height());
+       m_background = QPixmap((int)m_boundingRect.width(), 
(int)m_boundingRect.height());
        m_background.fill(QColor(Qt::transparent));
        
        QPainter painter(&m_background);
@@ -55,7 +55,7 @@
        painter.setBrush(QColor(255, 255, 255, 225));
        painter.setPen(Qt::NoPen);
        int rounding = 10;
-       painter.drawRoundRect(0, 0, m_boundingRect.width(), 
m_boundingRect.height(), rounding, rounding);
+       painter.drawRoundRect(0, 0, (int)m_boundingRect.width(), 
(int)m_boundingRect.height(), rounding, rounding);
 }
 
 void PositionIndicator::set_position(int x, int y)