From: Marco Gittler Date: Sat, 28 Mar 2009 08:57:26 +0000 (+0000) Subject: Patch from Ray Lehtiniemi (3): X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=db7cce03362cb505c93ead2086e1f5653059bc65;p=kdenlive Patch from Ray Lehtiniemi (3): Optimize empty variable initializations this-> is redundant Fix up a youtube export resolution svn path=/trunk/kdenlive/; revision=3186 --- diff --git a/export/profiles.xml b/export/profiles.xml index b2d642b1..b573b2b2 100644 --- a/export/profiles.xml +++ b/export/profiles.xml @@ -178,7 +178,7 @@ - + diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 6bb7d6c2..80f4c1e8 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -1030,7 +1030,7 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { resetSelectionGroup(); QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(';'); m_selectionGroup = new AbstractGroupItem(m_document->fps()); - QPoint pos = QPoint(); + QPoint pos; DocClipBase *clip = m_document->getBaseClip(list.at(0)); if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0); ItemInfo info; @@ -1055,8 +1055,8 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { resetSelectionGroup(false); m_selectionGroup = new AbstractGroupItem(m_document->fps()); - QPoint pos = QPoint(); - GenTime start = GenTime(); + QPoint pos; + GenTime start; QList offsetList; for (int i = 0; i < ids.size(); ++i) { DocClipBase *clip = m_document->getBaseClip(ids.at(i)); @@ -1827,8 +1827,8 @@ void CustomTrackView::slotRemoveSpace() { QRectF r(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 1); QList items = m_scene->items(r); - QList clipsToMove = QList (); - QList transitionsToMove = QList (); + QList clipsToMove; + QList transitionsToMove; for (int i = 0; i < items.count(); i++) { if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { @@ -1872,8 +1872,8 @@ void CustomTrackView::slotInsertSpace() { QRectF r(pos.frames(m_document->fps()), minh, sceneRect().width() - pos.frames(m_document->fps()), maxh); QList items = m_scene->items(r); - QList clipsToMove = QList (); - QList transitionsToMove = QList (); + QList clipsToMove; + QList transitionsToMove; for (int i = 0; i < items.count(); i++) { if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { @@ -2039,8 +2039,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { if (timeOffset != GenTime()) { QList items = m_selectionGroup->childItems(); - QList clipsToMove = QList (); - QList transitionsToMove = QList (); + QList clipsToMove; + QList transitionsToMove; // Create lists with start pos for each track QMap trackClipStartList; @@ -2209,8 +2209,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { QGraphicsItemGroup *group = static_cast (m_dragItem->parentItem()); QList items = group->childItems(); - QList clipsToMove = QList (); - QList transitionsToMove = QList (); + QList clipsToMove; + QList transitionsToMove; GenTime timeOffset = GenTime(m_dragItem->scenePos().x(), m_document->fps()) - m_dragItemInfo.startPos; const int trackOffset = (int)(m_dragItem->scenePos().y() / m_tracksHeight) - m_dragItemInfo.track; diff --git a/src/effectslist.cpp b/src/effectslist.cpp index 91f1119f..1c8be746 100644 --- a/src/effectslist.cpp +++ b/src/effectslist.cpp @@ -31,8 +31,8 @@ EffectsList::~EffectsList() { QDomElement EffectsList::getEffectByName(const QString & name) const { QString effectName; - for (int i = 0; i < this->size(); ++i) { - QDomElement effect = this->at(i); + for (int i = 0; i < size(); ++i) { + QDomElement effect = at(i); QDomNode namenode = effect.elementsByTagName("name").item(0); if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); if (name == effectName) { @@ -51,8 +51,8 @@ QDomElement EffectsList::getEffectByName(const QString & name) const { QDomElement EffectsList::getEffectByTag(const QString & tag, const QString & id) const { - if (!id.isEmpty()) for (int i = 0; i < this->size(); ++i) { - QDomElement effect = this->at(i); + if (!id.isEmpty()) for (int i = 0; i < size(); ++i) { + QDomElement effect = at(i); //kDebug() << "// SRCH EFFECT; " << id << ", LKING: " << effect.attribute("id"); if (effect.attribute("id") == id) { QDomNodeList params = effect.elementsByTagName("parameter"); @@ -65,8 +65,8 @@ QDomElement EffectsList::getEffectByTag(const QString & tag, const QString & id) } } - if (!tag.isEmpty()) for (int i = 0; i < this->size(); ++i) { - QDomElement effect = this->at(i); + if (!tag.isEmpty()) for (int i = 0; i < size(); ++i) { + QDomElement effect = at(i); if (effect.attribute("tag") == tag) { QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { @@ -82,8 +82,8 @@ QDomElement EffectsList::getEffectByTag(const QString & tag, const QString & id) } int EffectsList::hasEffect(const QString & tag, const QString & id) const { - for (int i = 0; i < this->size(); ++i) { - QDomElement effect = this->at(i); + for (int i = 0; i < size(); ++i) { + QDomElement effect = at(i); if (!id.isEmpty()) { if (effect.attribute("id") == id) return i; } else if (!tag.isEmpty() && effect.attribute("tag") == tag) return i; @@ -93,7 +93,7 @@ int EffectsList::hasEffect(const QString & tag, const QString & id) const { QStringList EffectsList::effectIdInfo(const int ix) const { QStringList info; - QDomElement effect = this->at(ix); + QDomElement effect = at(ix); QDomNode namenode = effect.elementsByTagName("name").item(0); info << i18n(namenode.toElement().text().toUtf8().data()) << effect.attribute("tag") << effect.attribute("id"); return info; @@ -101,8 +101,8 @@ QStringList EffectsList::effectIdInfo(const int ix) const { QStringList EffectsList::effectNames() { QStringList list; - for (int i = 0; i < this->size(); ++i) { - QDomElement effect = this->at(i); + for (int i = 0; i < size(); ++i) { + QDomElement effect = at(i); QDomNode namenode = effect.elementsByTagName("name").item(0); if (!namenode.isNull()) list.append(i18n(namenode.toElement().text().toUtf8().data())); } @@ -121,7 +121,7 @@ QString EffectsList::getInfo(const QString & tag, const QString & id) const { QString EffectsList::getInfoFromIndex(const int ix) const { QString info; - QDomElement effect = this->at(ix); + QDomElement effect = at(ix); QDomNode namenode = effect.elementsByTagName("description").item(0); if (!namenode.isNull()) info = i18n(namenode.toElement().text().toUtf8().data()); namenode = effect.elementsByTagName("author").item(0); @@ -139,9 +139,9 @@ bool EffectsList::hasKeyFrames(QDomElement effect) { } EffectsList EffectsList::clone() const { - EffectsList list = EffectsList(); - for (int i = 0; i < this->size(); ++i) { - list.append(this->at(i).cloneNode().toElement()); + EffectsList list; + for (int i = 0; i < size(); ++i) { + list.append(at(i).cloneNode().toElement()); } return list; } diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp index 2f60bc1b..94f84095 100644 --- a/src/effectslistwidget.cpp +++ b/src/effectslistwidget.cpp @@ -135,7 +135,7 @@ QString EffectsListWidget::currentInfo() { // virtual void EffectsListWidget::mousePressEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton) { - this->m_DragStartPosition = event->pos(); + m_DragStartPosition = event->pos(); m_dragStarted = true; } KListWidget::mousePressEvent(event); diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index 84115856..7fd0099f 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -868,7 +868,7 @@ bool KdenliveDoc::convertDocument(double version) { kDebug() << "found" << avfiles.count() << "s and" << kproducers.count() << "s"; for (int i = 0; i < avfiles.count(); ++i) { QDomElement avfile = avfiles.at(i).toElement(); - QDomElement kproducer = QDomElement(); + QDomElement kproducer; if (avfile.isNull()) kWarning() << "found an that is not a QDomElement"; else { diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index dfd61d78..294ae432 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -2288,7 +2288,7 @@ void MainWindow::keyPressEvent(QKeyEvent *ke) { void MainWindow::hideEvent(QHideEvent */*event*/) { // kDebug() << "I was hidden"; // issue http://www.kdenlive.org/mantis/view.php?id=231 - if (this->isMinimized()) { + if (isMinimized()) { // kDebug() << "I am minimized"; if (m_monitorManager) m_monitorManager->stopActiveMonitor(); } diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp index e2cb3957..0a85acdb 100644 --- a/src/projectlistview.cpp +++ b/src/projectlistview.cpp @@ -194,7 +194,7 @@ void ProjectListView::dropEvent(QDropEvent *event) { // virtual void ProjectListView::mousePressEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton) { - this->m_DragStartPosition = event->pos(); + m_DragStartPosition = event->pos(); m_dragStarted = true; QTreeWidgetItem *underMouse = itemAt(event->pos()); if (underMouse && underMouse->isSelected()) emit focusMonitor(); diff --git a/src/renderer.cpp b/src/renderer.cpp index 09fd3077..096f2598 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -2741,7 +2741,7 @@ void Render::mltSavePlaylist() { } QList Render::producersList() { - QList prods = QList (); + QList prods; Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) return prods; Mlt::Tractor tractor(service); diff --git a/src/trackview.cpp b/src/trackview.cpp index b111c6fc..490d56c5 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -365,7 +365,7 @@ void TrackView::refresh() { void TrackView::slotRebuildTrackHeaders() { QList list = m_doc->tracksList(); - QList widgets = this->findChildren(); + QList widgets = findChildren(); for (int i = 0; i < widgets.count(); i++) delete widgets.at(i); int max = list.count(); @@ -633,7 +633,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) { } DocClipBase *TrackView::getMissingProducer(const QString id) const { - QDomElement missingXml = QDomElement(); + QDomElement missingXml; QDomDocument doc = m_doc->toXml(); QString docRoot = doc.documentElement().attribute("root"); if (!docRoot.endsWith('/')) docRoot.append('/'); @@ -684,7 +684,7 @@ const QString & TrackView::editMode() const { } void TrackView::slotChangeTrackLock(int ix, bool lock) { - QList widgets = this->findChildren(); + QList widgets = findChildren(); widgets.at(ix)->setLock(lock); } diff --git a/src/transition.cpp b/src/transition.cpp index 70f552b9..607f209a 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -268,12 +268,12 @@ bool Transition::belongsToClip(const ClipItem * clip) const { /* Transition *Transition::clone() { - return new Transition::Transition(rect(), m_referenceClip, this->toXML() , m_fps); + return new Transition::Transition(rect(), m_referenceClip, toXML() , m_fps); }*/ /* Transition *Transition::reparent(ClipItem * clip) { - return new Transition::Transition(rect(), clip, this->toXML(), m_fps, m_referenceClip->startPos()); + return new Transition::Transition(rect(), clip, toXML(), m_fps, m_referenceClip->startPos()); }*/ bool Transition::isValid() const { diff --git a/src/wizard.cpp b/src/wizard.cpp index 375e4f7c..da36d0b5 100644 --- a/src/wizard.cpp +++ b/src/wizard.cpp @@ -116,7 +116,7 @@ void Wizard::checkMltComponents() { m_mltCheck.programList->setColumnCount(2); m_mltCheck.programList->setRootIsDecorated(false); m_mltCheck.programList->setHeaderHidden(true); - QSize itemSize(20, this->fontMetrics().height() * 2.5); + QSize itemSize(20, fontMetrics().height() * 2.5); m_mltCheck.programList->setColumnWidth(0, 30); m_mltCheck.programList->setIconSize(QSize(24, 24)); @@ -286,7 +286,7 @@ void Wizard::slotCheckPrograms() { m_check.programList->setColumnCount(2); m_check.programList->setRootIsDecorated(false); m_check.programList->setHeaderHidden(true); - QSize itemSize(20, this->fontMetrics().height() * 2.5); + QSize itemSize(20, fontMetrics().height() * 2.5); m_check.programList->setColumnWidth(0, 30); m_check.programList->setIconSize(QSize(24, 24));