From b0c4f76122be35f6a9834f7988f2025e0bbece5a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Sat, 7 Mar 2009 18:06:02 +0000 Subject: [PATCH] [PATCH by Ray Lehtiniem] Delete some unused variables svn path=/trunk/kdenlive/; revision=3112 --- src/abstractclipitem.cpp | 2 -- src/abstractgroupitem.cpp | 1 - src/clipitem.cpp | 5 ----- src/customtrackview.cpp | 2 -- src/docclipbase.cpp | 1 - src/geometryval.cpp | 1 - src/graphicsscenerectmove.cpp | 1 - src/initeffects.cpp | 1 - src/kdenlivedoc.cpp | 1 - src/mainwindow.cpp | 1 - src/parameterplotter.cpp | 2 +- src/projectlist.cpp | 1 - src/projectlistview.cpp | 1 - src/renderer.cpp | 5 ----- src/titledocument.cpp | 1 - src/trackview.cpp | 1 - 16 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp index 7cff1601..5270a1d5 100644 --- a/src/abstractclipitem.cpp +++ b/src/abstractclipitem.cpp @@ -191,7 +191,6 @@ QPainterPath AbstractClipItem::upperRectPart(QRectF br) { int br_startx = (int)(br.x() + offset); int br_starty = (int)(br.y()); int br_halfy = (int)(br.y() + br.height() / 2 - offset); - int br_endy = (int)(br.y() + br.height()); roundRectPathUpper.moveTo(br_endx , br_halfy); roundRectPathUpper.arcTo(br_endx - roundingX , br_starty , roundingX, roundingY, 0.0, 90.0); @@ -210,7 +209,6 @@ QPainterPath AbstractClipItem::lowerRectPart(QRectF br) { int br_endx = (int)(br.x() + br .width() - offset); int br_startx = (int)(br.x() + offset); - int br_starty = (int)(br.y()); int br_halfy = (int)(br.y() + br.height() / 2 - offset); int br_endy = (int)(br.y() + br.height() - 1); diff --git a/src/abstractgroupitem.cpp b/src/abstractgroupitem.cpp index f605218d..ec106a35 100644 --- a/src/abstractgroupitem.cpp +++ b/src/abstractgroupitem.cpp @@ -130,7 +130,6 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant else { bool forwardMove = newPos.x() > start.x(); int offset = 0; - const double width = sceneBoundingRect().width() + 1; for (int i = 0; i < collindingItems.count(); i++) { QGraphicsItem *collision = collindingItems.at(i); if (collision->type() == AVWIDGET) { diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 1aeaec11..d22f3b75 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -337,8 +337,6 @@ void ClipItem::updateKeyframeEffect() { QString keyframes; if (m_keyframes.count() > 1) { QMap::const_iterator i = m_keyframes.constBegin(); - double x1; - double y1; while (i != m_keyframes.constEnd()) { keyframes.append(QString::number(i.key()) + ':' + QString::number(i.value()) + ';'); ++i; @@ -629,7 +627,6 @@ void ClipItem::paint(QPainter *painter, QList < CommentedTime >::Iterator it = markers.begin(); GenTime pos; double framepos; - const int markerwidth = 4; QBrush markerBrush; markerBrush = QBrush(QColor(120, 120, 0, 140)); QPen pen = painter->pen(); @@ -800,7 +797,6 @@ QList ClipItem::snapMarkers() const { QList < GenTime > snaps; QList < GenTime > markers = baseClip()->snapMarkers(); GenTime pos; - double framepos; for (int i = 0; i < markers.size(); i++) { pos = markers.at(i) - cropStart(); @@ -816,7 +812,6 @@ QList ClipItem::commentedSnapMarkers() const { QList < CommentedTime > snaps; QList < CommentedTime > markers = baseClip()->commentedSnapMarkers(); GenTime pos; - double framepos; for (int i = 0; i < markers.size(); i++) { pos = markers.at(i).time() - cropStart(); diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 3dcc23b6..eb78be5a 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -1878,8 +1878,6 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { m_dragItem = NULL; return; } else if (m_operationMode == SPACER) { - int endClick = (int)(mapToScene(event->pos()).x() + 0.5); - int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5); int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); if (m_selectionGroup->sceneBoundingRect().height() > m_tracksHeight) { // We are moving all tracks diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index 81c55ad2..eacbd33c 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -416,7 +416,6 @@ Mlt::Producer *DocClipBase::producer(int track) { }*/ if (track == -1 || (m_clipType != AUDIO && m_clipType != AV)) { if (m_baseTrackProducers.count() == 0) return NULL; - int i; for (int i = 0; i < m_baseTrackProducers.count(); i++) { if (m_baseTrackProducers.at(i) != NULL) return m_baseTrackProducers.at(i); diff --git a/src/geometryval.cpp b/src/geometryval.cpp index a42d96d1..62584209 100644 --- a/src/geometryval.cpp +++ b/src/geometryval.cpp @@ -45,7 +45,6 @@ Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent): QWidge scene = new GraphicsSceneRectMove(this); scene->setTool(TITLE_SELECT); view->setScene(scene); - double aspect = (double) profile.sample_aspect_num / profile.sample_aspect_den * profile.width / profile.height; QGraphicsRectItem *m_frameBorder = new QGraphicsRectItem(QRectF(0, 0, profile.width, profile.height)); m_frameBorder->setZValue(-1100); m_frameBorder->setBrush(QColor(255, 255, 0, 30)); diff --git a/src/graphicsscenerectmove.cpp b/src/graphicsscenerectmove.cpp index 3c94eccf..7126a93c 100644 --- a/src/graphicsscenerectmove.cpp +++ b/src/graphicsscenerectmove.cpp @@ -365,7 +365,6 @@ void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent* e) { void GraphicsSceneRectMove::wheelEvent(QGraphicsSceneWheelEvent * wheelEvent) { QList viewlist = views(); //kDebug() << wheelEvent->delta() << " " << zoom; - double scale = 1.0; if (viewlist.size() > 0) { if (wheelEvent->delta() < 0) emit sceneZoom(true); else emit sceneZoom(false); diff --git a/src/initeffects.cpp b/src/initeffects.cpp index c6384cfd..12174d8d 100644 --- a/src/initeffects.cpp +++ b/src/initeffects.cpp @@ -271,7 +271,6 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *au // Parse effect file if ((filtersList.contains(tag) || producersList.contains(tag)) && ladspaOk) { - bool isAudioEffect = false; QString type = documentElement.attribute("type", QString()); if (type == "audio") audioEffectList->append(documentElement); else if (type == "custom") customEffectList->append(documentElement); diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index 23d4d984..2f752556 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -1260,7 +1260,6 @@ const QString KdenliveDoc::description() const { void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) { const QString producerId = clipId.section('_', 0, 0); - int subtrack = clipId.section('_', 1, 1).toInt(); DocClipBase *clip = m_clipManager->getClipById(producerId); if (clip == NULL) { /*kDebug()<<"// CLIP "< list = pointsUnderPoint(event->pos() - QPoint(leftPadding(), topPadding())) ; - int i = 0, j = -1; + int i = 0; foreach(KPlotObject *o, plotObjects()) { QList points = o->points(); for (int p = 0;p < points.size();p++) { diff --git a/src/projectlist.cpp b/src/projectlist.cpp index f2b116d3..c821e177 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -57,7 +57,6 @@ ProjectList::ProjectList(QWidget *parent) : QWidget(parent), m_render(NULL), m_fps(-1), m_commandStack(NULL), m_selectedItem(NULL), m_infoQueue(QMap ()), m_thumbnailQueue(QList ()), m_refreshed(false), m_editAction(NULL), m_openAction(NULL), m_deleteAction(NULL), m_reloadAction(NULL) { - QWidget *vbox = new QWidget; listView = new ProjectListView(this);; QVBoxLayout *layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp index 117d0456..5faa3591 100644 --- a/src/projectlistview.cpp +++ b/src/projectlistview.cpp @@ -68,7 +68,6 @@ void ProjectListView::configureColumns(const QPoint& pos) { QHeaderView* headerView = header(); for (int i = 2; i < headerView->count(); ++i) { - const int logicalIndex = headerView->logicalIndex(i); const QString text = model()->headerData(i, Qt::Horizontal).toString(); QAction* action = popup.addAction(text); action->setCheckable(true); diff --git a/src/renderer.cpp b/src/renderer.cpp index 0f8f9312..914e3355 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -533,7 +533,6 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo delete[] tmp; int frameNumber = xml.attribute("thumbnail", "0").toInt(); if (frameNumber != 0) producer->seek(frameNumber); - mlt_properties properties = MLT_PRODUCER_PROPERTIES(producer->get_producer()); filePropertyMap["duration"] = QString::number(producer->get_playtime()); //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer.get_playtime(); @@ -2388,7 +2387,6 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); - Mlt::Field *field = tractor.field(); mlt_service_lock(service.get_service()); m_mltConsumer->set("refresh", 0); @@ -2445,7 +2443,6 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G m_isBlocked = true; Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); - Mlt::Field *field = tractor.field(); //m_mltConsumer->set("refresh", 0); mlt_service serv = m_mltProducer->parent().get_service(); @@ -2623,7 +2620,6 @@ void Render::mltDeleteTransparency(int pos, int track, int id) { void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int track, int id) { Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); - Mlt::Field *field = tractor.field(); mlt_service_lock(service.get_service()); m_mltConsumer->set("refresh", 0); @@ -2662,7 +2658,6 @@ void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int t void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int endTrack, int id) { Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); - Mlt::Field *field = tractor.field(); mlt_service_lock(service.get_service()); m_mltConsumer->set("refresh", 0); diff --git a/src/titledocument.cpp b/src/titledocument.cpp index 4b42e876..664c3311 100644 --- a/src/titledocument.cpp +++ b/src/titledocument.cpp @@ -155,7 +155,6 @@ bool TitleDocument::saveDocument(const KUrl& url, QGraphicsPolygonItem* startv, int TitleDocument::loadDocument(const KUrl& url, QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv) { QString tmpfile; QDomDocument doc; - double aspect_ratio = 4.0 / 3.0; if (!scene) return -1; diff --git a/src/trackview.cpp b/src/trackview.cpp index 57b48fa3..1e8368e4 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -374,7 +374,6 @@ void TrackView::slotRebuildTrackHeaders() { int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) { - int trackTop = KdenliveSettings::trackheight() * ix; // parse track int position = 0; for (QDomNode n = xml.firstChild(); !n.isNull(); n = n.nextSibling()) { -- 2.39.2