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 b2d642b1fb0dd1d22e6793f75b1344ceb2d8ed87..b573b2b2006840ab5a4ba2d83ef594792f20c5ed 100644 (file)
--- a/export/profiles.xml
+++ b/export/profiles.xml
@@ -178,7 +178,7 @@
    <profile name="Vimeo 640x480" extension="mp4" args="f=mp4 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=3000k s=640x480 aspect=%dar mbd=2 trellis=1 mv4=1" url="http://www.vimeo.com/upload" />
   <profile name="Vimeo 1280x720" extension="mp4" args="f=mp4 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=5000k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1" url="http://www.vimeo.com/upload" />
   <profile name="Youtube 640x480" extension="mp4" args="f=mp4 acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=800k s=640x480 aspect=%dar mbd=2 trellis=1 mv4=1" url="http://www.youtube.com/upload" />
-  <profile name="Youtube 1290x720" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=41100 vcodec=mpeg4 minrate=0 b=2000k s=1290x720 aspect=%dar mbd=2 trellis=1 mv4=1" url="http://www.youtube.com/upload" />
+  <profile name="Youtube 1280x720" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=41100 vcodec=mpeg4 minrate=0 b=2000k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1" url="http://www.youtube.com/upload" />
 
 </group>
 

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 6bb7d6c2c738e5968509c927497d05520f94ff5b..80f4c1e8dceb69b53736df5204a7c40e591d5a06 100644 (file)
--- 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 <GenTime> 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<QGraphicsItem *> items = m_scene->items(r);
 
-    QList<ItemInfo> clipsToMove = QList<ItemInfo> ();
-    QList<ItemInfo> transitionsToMove = QList<ItemInfo> ();
+    QList<ItemInfo> clipsToMove;
+    QList<ItemInfo> 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<QGraphicsItem *> items = m_scene->items(r);
 
-    QList<ItemInfo> clipsToMove = QList<ItemInfo> ();
-    QList<ItemInfo> transitionsToMove = QList<ItemInfo> ();
+    QList<ItemInfo> clipsToMove;
+    QList<ItemInfo> 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<QGraphicsItem *> items = m_selectionGroup->childItems();
 
-            QList<ItemInfo> clipsToMove = QList<ItemInfo> ();
-            QList<ItemInfo> transitionsToMove = QList<ItemInfo> ();
+            QList<ItemInfo> clipsToMove;
+            QList<ItemInfo> transitionsToMove;
 
             // Create lists with start pos for each track
             QMap <int, int> trackClipStartList;
@@ -2209,8 +2209,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
             QGraphicsItemGroup *group = static_cast <QGraphicsItemGroup *>(m_dragItem->parentItem());
             QList<QGraphicsItem *> items = group->childItems();
 
-            QList<ItemInfo> clipsToMove = QList<ItemInfo> ();
-            QList<ItemInfo> transitionsToMove = QList<ItemInfo> ();
+            QList<ItemInfo> clipsToMove;
+            QList<ItemInfo> 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 91f1119f867344a51764bed04a621960b8235f31..1c8be746bb2c84d27ce977cd1272e0f129f24faa 100644 (file)
--- 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 2f60bc1b4a698630d23fc79ecf6b0ab3093047ca..94f840957be39afcc8f6ee8602233daca4ed8bf6 100644 (file)
--- 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 841158567434f3069616e54530d40c2fd331ce4e..7fd0099f15b3f5213df22cae3c046b8da3aeaf4d 100644 (file)
--- a/src/kdenlivedoc.cpp
+++ b/src/kdenlivedoc.cpp
@@ -868,7 +868,7 @@ bool KdenliveDoc::convertDocument(double version) {
     kDebug() << "found" << avfiles.count() << "<avfile />s and" << kproducers.count() << "<kdenlive_producer />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 <avfile /> that is not a QDomElement";
         else {

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index dfd61d78db8b18db4a3a1f4c4fa88bb176185263..294ae432e16fae5950efd3526772a1302868e467 100644 (file)
--- 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 e2cb395749f7ad5ecd7b310a7e2383858d27ade9..0a85acdb6f7f717d0c1376ab2889f3b2ce6bf98a 100644 (file)
--- 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 09fd30778dce7f3efa026bfae927f4940262c215..096f25986af1b09b934bc8b3ca5ebc35e2f1715c 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -2741,7 +2741,7 @@ void Render::mltSavePlaylist() {
 }
 
 QList <Mlt::Producer *> Render::producersList() {
-    QList <Mlt::Producer *> prods = QList <Mlt::Producer *> ();
+    QList <Mlt::Producer *> 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 b111c6fcc3edb30781245754bc9e2550c94c0191..490d56c5a431ff3b719393f678c92b5828e0cc4c 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -365,7 +365,7 @@ void TrackView::refresh() {
 
 void TrackView::slotRebuildTrackHeaders() {
     QList <TrackInfo> list = m_doc->tracksList();
-    QList<HeaderTrack *> widgets = this->findChildren<HeaderTrack *>();
+    QList<HeaderTrack *> widgets = findChildren<HeaderTrack *>();
     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<HeaderTrack *> widgets = this->findChildren<HeaderTrack *>();
+    QList<HeaderTrack *> widgets = findChildren<HeaderTrack *>();
     widgets.at(ix)->setLock(lock);
 }
 

diff --git a/src/transition.cpp b/src/transition.cpp
index 70f552b93cbdf064fd8b6dc41e33bd081bb0ffd6..607f209ab879a676cd55e1445a3ec8aecc72a08d 100644 (file)
--- 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 375e4f7cf38dc7ef49bdc3569960e9f3d0ec8847..da36d0b516a96fbddf96a070b9d0e915421cee5a 100644 (file)
--- 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));