From ca14ee82a6fd653459e2dcd6f5c406eb65faea00 Mon Sep 17 00:00:00 2001 From: Marco Gittler Date: Sat, 22 Mar 2008 00:17:19 +0000 Subject: [PATCH] removed warnings to see real warning messages (except customtrackview) svn path=/branches/KDE4/; revision=2097 --- src/clipitem.cpp | 2 +- src/customruler.cpp | 12 ++++++------ src/customtrackview.cpp | 4 ++-- src/kthumb.cpp | 8 ++++---- src/mainwindow.cpp | 4 ++-- src/monitor.cpp | 2 +- src/projectlistview.cpp | 2 +- src/smallruler.cpp | 2 +- src/trackview.cpp | 4 ++-- src/transition.cpp | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 7050d013..d0cef429 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -242,7 +242,7 @@ void ClipItem::paint(QPainter *painter, if (scale != framePixelWidth) audioThumbCachePic.clear(); emit prepareAudioThumb(scale, path, startpixel, endpixel + 200);//200 more for less missing parts before repaint after scrolling - int cropLeft = (m_cropStart).frames(m_fps) * scale; + int cropLeft = (int)((m_cropStart).frames(m_fps) * scale); for (int startCache = startpixel - startpixel % 100; startCache < endpixel + 300;startCache += 100) { if (audioThumbCachePic.contains(startCache) && !audioThumbCachePic[startCache].isNull()) painter->drawPixmap((int)(roundRectPathUpper.united(roundRectPathLower).boundingRect().x() + startCache - cropLeft), (int)(path.boundingRect().y()), audioThumbCachePic[startCache]); diff --git a/src/customruler.cpp b/src/customruler.cpp index 4be4a087..7a2a96d6 100644 --- a/src/customruler.cpp +++ b/src/customruler.cpp @@ -91,7 +91,7 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) // virtual void CustomRuler::mousePressEvent(QMouseEvent * event) { m_view->activateMonitor(); - int pos = (event->x() + offset()) / pixelPerMark() / FRAME_SIZE; + int pos = (int)((event->x() + offset()) / pixelPerMark() / FRAME_SIZE); m_moveCursor = RULER_CURSOR; if (event->y() > 10) { if (abs(pos - m_zoneStart) < 4) m_moveCursor = RULER_START; @@ -104,7 +104,7 @@ void CustomRuler::mousePressEvent(QMouseEvent * event) { // virtual void CustomRuler::mouseMoveEvent(QMouseEvent * event) { - int pos = (event->x() + offset()) / pixelPerMark() / FRAME_SIZE; + int pos = (int)((event->x() + offset()) / pixelPerMark() / FRAME_SIZE); if (m_moveCursor == RULER_CURSOR) { m_view->setCursorPos(pos); return; @@ -154,12 +154,12 @@ void CustomRuler::paintEvent(QPaintEvent *e) { //p.fillRect(e->rect(), QBrush(QColor(200, 200, 200))); //kDebug()<<"RULER ZONE: "<rect().y(), projectEnd, e->rect().height()), QBrush(QColor(245, 245, 245))); - int zoneStart = m_zoneStart * pixelPerMark() * FRAME_SIZE; - int zoneEnd = m_zoneEnd * pixelPerMark() * FRAME_SIZE; + int zoneStart = (int)(m_zoneStart * pixelPerMark() * FRAME_SIZE); + int zoneEnd = (int)(m_zoneEnd * pixelPerMark() * FRAME_SIZE); p.fillRect(QRect(zoneStart - offset(), e->rect().y() + e->rect().height() / 2, zoneEnd - zoneStart, e->rect().height() / 2), QBrush(QColor(133, 255, 143))); @@ -175,7 +175,7 @@ void CustomRuler::paintEvent(QPaintEvent *e) { offsetmin = (double)(minval - offset()), offsetmax = (double)(maxval - offset()), fontOffset = (((double)minval) > offsetmin) ? (double)minval : offsetmin; - QRect bg = QRect(offsetmin, 0, offsetmax, height()); + QRect bg = QRect((int)offsetmin, 0, (int)offsetmax, height()); QPalette palette; //p.fillRect(bg, palette.light()); diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index eb9086ca..d3593699 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -141,7 +141,7 @@ int CustomTrackView::getPreviousVideoTrack(int track) { // virtual void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int pos = event->x(); - emit mousePosition(mapToScene(event->pos()).x() / m_scale); + emit mousePosition((int)(mapToScene(event->pos()).x() / m_scale)); /*if (event->modifiers() == Qt::ControlModifier) setDragMode(QGraphicsView::ScrollHandDrag); else if (event->modifiers() == Qt::ShiftModifier) @@ -162,7 +162,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int offset = moveTrack - currentTrack; if (offset != 0) offset = m_tracksHeight * offset; - m_dragItem->moveTo(snappedPos / m_scale, m_scale, offset, moveTrack); + m_dragItem->moveTo((int)(snappedPos / m_scale), m_scale, offset, moveTrack); } else if (m_operationMode == RESIZESTART) { double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x()); m_dragItem->resizeStart(snappedPos / m_scale, m_scale); diff --git a/src/kthumb.cpp b/src/kthumb.cpp index e8496b0e..8f1b9d47 100644 --- a/src/kthumb.cpp +++ b/src/kthumb.cpp @@ -188,19 +188,19 @@ void KThumb::extractImage(int frame, int frame2) { char *tmp = Render::decodedString(m_url.path()); Mlt::Producer m_producer(*m_profile, tmp); delete[] tmp; - + int twidth = (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio()); if (m_producer.is_blank()) { - QPixmap pix(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio(), KdenliveSettings::trackheight()); + QPixmap pix(twidth, KdenliveSettings::trackheight()); pix.fill(Qt::black); emit thumbReady(frame, pix); return; } if (frame != -1) { - QPixmap pix = getFrame(&m_producer, frame, KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio(), KdenliveSettings::trackheight()); + QPixmap pix = getFrame(&m_producer, frame, twidth, KdenliveSettings::trackheight()); emit thumbReady(frame, pix); } if (frame2 != -1) { - QPixmap pix = getFrame(&m_producer, frame2, KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio(), KdenliveSettings::trackheight()); + QPixmap pix = getFrame(&m_producer, frame2, twidth , KdenliveSettings::trackheight()); emit thumbReady(frame2, pix); } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 4c5a35d0..e5082ad9 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -208,7 +208,7 @@ MainWindow::MainWindow(QWidget *parent) setupGUI(Default, NULL /*"kdenliveui.rc"*/); kDebug() << factory() << " " << factory()->container("video_effects_menu", this); - +#if 0 // build effects menus QAction *action; QMenu *videoEffectsMenu = (QMenu*)(factory()->container("video_effects_menu", this)); @@ -246,7 +246,7 @@ MainWindow::MainWindow(QWidget *parent) m_timelineContextClipMenu->addMenu(videoEffectsMenu); m_timelineContextClipMenu->addMenu(audioEffectsMenu); m_timelineContextClipMenu->addMenu(customEffectsMenu); - +#endif connect(projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, SLOT(refreshMonitor(bool))); connect(clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool))); //connect(m_monitorManager, SIGNAL(connectMonitors()), this, SLOT(slotConnectMonitors())); diff --git a/src/monitor.cpp b/src/monitor.cpp index be3cdcf7..cd4172dd 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -129,7 +129,7 @@ void Monitor::activateMonitor() { void Monitor::slotSeek(int pos) { if (!m_isActive) m_monitorManager->activateMonitor(m_name); if (render == NULL) return; - int realPos = ((double) pos) / m_scale; + int realPos = (int)(((double) pos) / m_scale); render->seekToFrame(realPos); m_position = realPos; emit renderPosition(m_position); diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp index f35f5abb..653a82ba 100644 --- a/src/projectlistview.cpp +++ b/src/projectlistview.cpp @@ -156,7 +156,7 @@ void ProjectListView::mouseMoveEvent(QMouseEvent *event) { //mimeData->setText(ids.join(";")); //doc.toString()); //mimeData->setImageData(image); drag->setMimeData(mimeData); - drag->setPixmap(clickItem->icon(0).pixmap(50 *16 / 9.0, 50)); + drag->setPixmap(clickItem->icon(0).pixmap((int)(50 *16 / 9.0), 50)); drag->setHotSpot(QPoint(0, 50)); drag->start(Qt::MoveAction); diff --git a/src/smallruler.cpp b/src/smallruler.cpp index 5d9d23ca..687da8c5 100644 --- a/src/smallruler.cpp +++ b/src/smallruler.cpp @@ -76,7 +76,7 @@ void SmallRuler::mouseMoveEvent(QMouseEvent * event) { } void SmallRuler::slotNewValue(int _value) { - m_cursorPosition = _value / pixelPerMark(); + m_cursorPosition = (int)(_value / pixelPerMark()); KRuler::slotNewValue(_value); } diff --git a/src/trackview.cpp b/src/trackview.cpp index 75b98281..4d016311 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -167,7 +167,7 @@ void TrackView::slotChangeZoom(int factor) { } int TrackView::fitZoom() const { - int zoom = (duration() + 20 / m_scale) * FRAME_SIZE / m_trackview->width(); + int zoom = (int)((duration() + 20 / m_scale) * FRAME_SIZE / m_trackview->width()); int i; for (i = 0; i < 13; i++) if (m_ruler->comboScale[i] > zoom) break; @@ -179,7 +179,7 @@ const double TrackView::zoomFactor() const { } const int TrackView::mapLocalToValue(int x) const { - return (int) x * zoomFactor(); + return (int)(x * zoomFactor()); } KdenliveDoc *TrackView::document() { diff --git a/src/transition.cpp b/src/transition.cpp index 31238184..05a3a09b 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -196,7 +196,7 @@ void Transition::paint(QPainter *painter, //painter->fillPath(roundRectPath, brush()); //, QBrush(QColor(Qt::red))); painter->fillRect(br.intersected(rectInView), QBrush(QColor(200, 200, 0, 160)/*,Qt::Dense4Pattern*/)); painter->setClipRect(option->exposedRect); - painter->drawPixmap(br.x() + 10, br.y() + 10, transitionPixmap()); + painter->drawPixmap((int)(br.x() + 10), (int)(br.y() + 10), transitionPixmap()); painter->drawPath(resultClipPath.intersected(clippath)); QPen pen = painter->pen(); -- 2.39.5