reindent.sh ;)

svn path=/trunk/kdenlive/; revision=4093

diff --git a/plugins/sampleplugin/sampleplugin.cpp b/plugins/sampleplugin/sampleplugin.cpp
index f7adba7e1e2f851cc4aafacc125cdb31c3b3ef40..2d40a04116aa4af09cfa5a7a6224c66432bdbcbb 100644 (file)
--- a/plugins/sampleplugin/sampleplugin.cpp
+++ b/plugins/sampleplugin/sampleplugin.cpp
@@ -77,7 +77,7 @@ KUrl SamplePlugin::generatedClip(const QString &generator, const KUrl &projectFo
             prod.setAttribute("mlt_service", "noise");
             prod.setAttribute("in", "0");
             prod.setAttribute("out", QString::number((int) fps * view.duration->value()));
-           prod.setAttribute("resource", "<producer>");
+            prod.setAttribute("resource", "<producer>");
             playlist.appendChild(prod);
         } else {
             for (int i = 0; i < view.duration->value(); i++) {
@@ -87,7 +87,7 @@ KUrl SamplePlugin::generatedClip(const QString &generator, const KUrl &projectFo
                 prod.setAttribute("in", "0");
                 prod.setAttribute("out", QString::number((int) fps));
                 prod.setAttribute("text", QString::number(view.duration->value() - i));
-               prod.setAttribute("resource", "&lt;producer&gt;");
+                prod.setAttribute("resource", "&lt;producer&gt;");
                 //FIXME: the font and pad values are approximate, the pango producer seems unable
                 // to produce a predictable frame size.
                 prod.setAttribute("font", QString::number(view.font->value()) + "px");

diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp
index 5b990206630a4f9138e4c94dc692232b0e7b5711..47905faad8b9e4728944d093d3d11cb797a5dc38 100644 (file)
--- a/src/abstractclipitem.cpp
+++ b/src/abstractclipitem.cpp
@@ -197,7 +197,7 @@ void AbstractClipItem::resizeEnd(int posx)
     if (durationDiff > GenTime()) {
         QList <QGraphicsItem *> collisionList = collidingItems(Qt::IntersectsItemBoundingRect);
         for (int i = 0; i < collisionList.size(); ++i) {
-           if (!collisionList.at(i)->isEnabled()) continue;
+            if (!collisionList.at(i)->isEnabled()) continue;
             QGraphicsItem *item = collisionList.at(i);
             if (item->type() == type() && item->pos().x() > pos().x()) {
                 kDebug() << "/////////  COLLISION DETECTED!!!!!!!!!";

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 9687020986b6957b583db02fda0eeb18981dfff1..6835d41912d0c2d81a8092f1a2d6d9da0fa32ef8 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -1173,7 +1173,7 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value)
         int offset = 0;
         if (!items.isEmpty()) {
             for (int i = 0; i < items.count(); i++) {
-               if (!items.at(i)->isEnabled()) continue;
+                if (!items.at(i)->isEnabled()) continue;
                 if (items.at(i)->type() == type()) {
                     // Collision!
                     QPointF otherPos = items.at(i)->pos();
@@ -1197,7 +1197,7 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value)
                         QList<QGraphicsItem*> subitems = scene()->items(sceneShape, Qt::IntersectsItemShape);
                         subitems.removeAll(this);
                         for (int j = 0; j < subitems.count(); j++) {
-                           if (!subitems.at(j)->isEnabled()) continue;
+                            if (!subitems.at(j)->isEnabled()) continue;
                             if (subitems.at(j)->type() == type()) {
                                 // move was not successful, revert to previous pos
                                 m_info.startPos = GenTime((int) pos().x(), m_fps);

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 2fcad0ac7e1a142ea8108379a8371906ff331e9f..c91a6cb6ae0353a20447f5e74680c835ab258a73 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -1753,7 +1753,7 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo
         item->baseClip()->addReference();
         m_document->updateClip(item->baseClip()->getId());
         setDocumentModified();
-       KdenliveSettings::setSnaptopoints(snap);
+        KdenliveSettings::setSnaptopoints(snap);
         return dup;
         //kDebug() << "/////////  CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25);
     } else {
@@ -1779,7 +1779,7 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo
 
         bool snap = KdenliveSettings::snaptopoints();
         KdenliveSettings::setSnaptopoints(false);
-       
+
         if (dup->isSelected()) emit clipItemSelected(NULL);
         dup->baseClip()->removeReference();
         m_document->updateClip(dup->baseClip()->getId());
@@ -1794,7 +1794,7 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo
             setDocumentModified();
         } else
             emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
-       KdenliveSettings::setSnaptopoints(snap);
+        KdenliveSettings::setSnaptopoints(snap);
         return item;
 
     }
@@ -2049,24 +2049,24 @@ void CustomTrackView::dropEvent(QDropEvent * event)
         m_commandStack->push(addCommand);
         setDocumentModified();
 
-       /*
-       // debug info
-       QRectF rect(0, 1 * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2);
-       QList<QGraphicsItem *> selection = m_scene->items(rect);
-       QStringList timelineList;
+        /*
+        // debug info
+        QRectF rect(0, 1 * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2);
+        QList<QGraphicsItem *> selection = m_scene->items(rect);
+        QStringList timelineList;
+
+        kDebug()<<"// ITEMS on TRACK: "<<selection.count();
+        for (int i = 0; i < selection.count(); i++) {
+            if (selection.at(i)->type() == AVWIDGET) {
+                ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
+                int start = clip->startPos().frames(m_document->fps());
+                int end = clip->endPos().frames(m_document->fps());
+                timelineList.append(QString::number(start) + "-" + QString::number(end));
+            }
+        }
+        kDebug() << "// COMPARE:\n" << timelineList << "\n-------------------";
+        */
 
-       kDebug()<<"// ITEMS on TRACK: "<<selection.count();
-       for (int i = 0; i < selection.count(); i++) {
-        if (selection.at(i)->type() == AVWIDGET) {
-            ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
-            int start = clip->startPos().frames(m_document->fps());
-            int end = clip->endPos().frames(m_document->fps());
-            timelineList.append(QString::number(start) + "-" + QString::number(end));
-           }
-       }
-       kDebug() << "// COMPARE:\n" << timelineList << "\n-------------------";
-       */
-       
         m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
         if (items.count() > 1) groupSelectedItems(true);
         event->setDropAction(Qt::MoveAction);
@@ -2082,13 +2082,13 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf
         bool snap = KdenliveSettings::snaptopoints();
         KdenliveSettings::setSnaptopoints(false);
         ItemInfo info;
-       if (item == NULL) info = posinfo;
-       else info = item->info();
+        if (item == NULL) info = posinfo;
+        else info = item->info();
         QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5);
         QList<QGraphicsItem *> selection = m_scene->items(rect);
         if (item) selection.removeAll(item);
         for (int i = 0; i < selection.count(); i++) {
-           if (!selection.at(i)->isEnabled()) continue;
+            if (!selection.at(i)->isEnabled()) continue;
             if (selection.at(i)->type() == AVWIDGET) {
                 ClipItem *clip = static_cast<ClipItem *>(selection.at(i));
                 if (clip->startPos() < info.startPos) {
@@ -2107,7 +2107,7 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf
                         new RazorClipCommand(this, clipInfo, info.startPos, false, command);
                         new ResizeClipCommand(this, dupInfo, newdupInfo, false, false, command);
                         ClipItem *dup = cutClip(clipInfo, info.startPos, true, false);
-                        if (dup) dup->resizeStart(info.endPos.frames(m_document->fps()));                      
+                        if (dup) dup->resizeStart(info.endPos.frames(m_document->fps()));
                     } else {
                         ItemInfo newclipInfo = clip->info();
                         newclipInfo.endPos = info.startPos;
@@ -2143,7 +2143,7 @@ void CustomTrackView::adjustTimelineTransitions(EDITMODE mode, Transition *item,
         QList<QGraphicsItem *> selection = m_scene->items(rect);
         selection.removeAll(item);
         for (int i = 0; i < selection.count(); i++) {
-           if (!selection.at(i)->isEnabled()) continue;
+            if (!selection.at(i)->isEnabled()) continue;
             if (selection.at(i)->type() == TRANSITIONWIDGET) {
                 Transition *tr = static_cast<Transition *>(selection.at(i));
                 if (tr->startPos() < info.startPos) {
@@ -3340,10 +3340,10 @@ void CustomTrackView::deleteClip(ItemInfo info, bool refresh)
     item->closeAnimation();
     /*if (refresh) item->closeAnimation();
     else {
-       // no refresh, means we have several operations chained, we need to delete clip immediatly 
-       // so that it does not get in the way of the other
-       delete item;
-       item = NULL;
+        // no refresh, means we have several operations chained, we need to delete clip immediatly
+        // so that it does not get in the way of the other
+        delete item;
+        item = NULL;
     }*/
 #else
     delete item;
@@ -3417,7 +3417,7 @@ void CustomTrackView::deleteSelectedClips()
     else if (transitionCount > 0 && groupCount == 0 && clipCount == 0)
         deleteSelected->setText(i18np("Delete selected transition", "Delete selected transitions", transitionCount));
     else deleteSelected->setText(i18n("Delete selected items"));
-    m_commandStack->push(deleteSelected);    
+    m_commandStack->push(deleteSelected);
 }
 
 void CustomTrackView::changeClipSpeed()
@@ -3625,7 +3625,7 @@ ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track)
     QList<QGraphicsItem *> list = scene()->items(QPointF(framepos - 1, track * m_tracksHeight + m_tracksHeight / 2));
     ClipItem *clip = NULL;
     for (int i = 0; i < list.size(); i++) {
-       if (!list.at(i)->isEnabled()) continue;
+        if (!list.at(i)->isEnabled()) continue;
         if (list.at(i)->type() == AVWIDGET) {
             ClipItem *test = static_cast <ClipItem *>(list.at(i));
             if (test->endPos() == pos) clip = test;
@@ -3640,7 +3640,7 @@ ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track)
     QList<QGraphicsItem *> list = scene()->items(QPointF(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2));
     ClipItem *clip = NULL;
     for (int i = 0; i < list.size(); i++) {
-       if (!list.at(i)->isEnabled()) continue;
+        if (!list.at(i)->isEnabled()) continue;
         if (list.at(i)->type() == AVWIDGET) {
             ClipItem *test = static_cast <ClipItem *>(list.at(i));
             if (test->startPos() == pos) clip = test;
@@ -3656,7 +3656,7 @@ ClipItem *CustomTrackView::getClipItemAt(int pos, int track)
     QList<QGraphicsItem *> list = scene()->items(p);
     ClipItem *clip = NULL;
     for (int i = 0; i < list.size(); i++) {
-       if (!list.at(i)->isEnabled()) continue;
+        if (!list.at(i)->isEnabled()) continue;
         if (list.at(i)->type() == AVWIDGET) {
             clip = static_cast <ClipItem *>(list.at(i));
             break;
@@ -3676,7 +3676,7 @@ Transition *CustomTrackView::getTransitionItemAt(int pos, int track)
     QList<QGraphicsItem *> list = scene()->items(p);
     Transition *clip = NULL;
     for (int i = 0; i < list.size(); i++) {
-       if (!list.at(i)->isEnabled()) continue;
+        if (!list.at(i)->isEnabled()) continue;
         if (list.at(i)->type() == TRANSITIONWIDGET) {
             clip = static_cast <Transition *>(list.at(i));
             break;
@@ -3697,7 +3697,7 @@ Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track)
     QList<QGraphicsItem *> list = scene()->items(p);
     Transition *clip = NULL;
     for (int i = 0; i < list.size(); i++) {
-       if (!list.at(i)->isEnabled()) continue;
+        if (!list.at(i)->isEnabled()) continue;
         if (list.at(i)->type() == TRANSITIONWIDGET) {
             Transition *test = static_cast <Transition *>(list.at(i));
             if (test->endPos() == pos) clip = test;
@@ -3713,7 +3713,7 @@ Transition *CustomTrackView::getTransitionItemAtStart(GenTime pos, int track)
     QList<QGraphicsItem *> list = scene()->items(p);
     Transition *clip = NULL;
     for (int i = 0; i < list.size(); ++i) {
-       if (!list.at(i)->isEnabled()) continue;
+        if (!list.at(i)->isEnabled()) continue;
         if (list.at(i)->type() == TRANSITIONWIDGET) {
             Transition *test = static_cast <Transition *>(list.at(i));
             if (test->startPos() == pos) clip = test;

diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp
index e6fbc7543da04e6fa4eed5031421f2465b1e995a..8b83045f76d6faf3c0b9acf77022084835ef239b 100644 (file)
--- a/src/docclipbase.cpp
+++ b/src/docclipbase.cpp
@@ -401,7 +401,7 @@ GenTime DocClipBase::findPreviousSnapMarker(const GenTime & currTime)
     if (it == 0) return GenTime();
     else if (it == m_snapMarkers.count() - 1 && m_snapMarkers.at(it).time() < currTime)
         return m_snapMarkers.at(it).time();
-    else return m_snapMarkers.at(it -1).time();
+    else return m_snapMarkers.at(it - 1).time();
 }
 
 GenTime DocClipBase::findNextSnapMarker(const GenTime & currTime)

diff --git a/src/folderprojectitem.h b/src/folderprojectitem.h
index ea9b5e6202f84e50006a906b446fec912689b0cc..5f936b3d7af8e79ae249c9b9e2162c98a637d85c 100644 (file)
--- a/src/folderprojectitem.h
+++ b/src/folderprojectitem.h
@@ -42,10 +42,10 @@ public:
 
     /** Make sure folders appear on top of the tree widget */
     virtual bool operator<(const QTreeWidgetItem &other)const {
-       int column = treeWidget()->sortColumn();
-       if (other.type() == PROJECTFOLDERTYPE)
-         return text(column).toLower() < other.text(column).toLower();
-       else return true;
+        int column = treeWidget()->sortColumn();
+        if (other.type() == PROJECTFOLDERTYPE)
+            return text(column).toLower() < other.text(column).toLower();
+        else return true;
     }
 
 private:

diff --git a/src/projectitem.h b/src/projectitem.h
index 0a8ab6e429f6410d98528ddd02a9e1410d21225d..5af45c86d51c7468be5eb815c8b45dfb4bdbe5ba 100644 (file)
--- a/src/projectitem.h
+++ b/src/projectitem.h
@@ -62,10 +62,10 @@ public:
     QString getClipHash() const;
 
     virtual bool operator<(const QTreeWidgetItem &other)const {
-       int column = treeWidget()->sortColumn();
-       if (other.type() != PROJECTFOLDERTYPE)
-         return text(column).toLower() < other.text(column).toLower();
-       else return false;
+        int column = treeWidget()->sortColumn();
+        if (other.type() != PROJECTFOLDERTYPE)
+            return text(column).toLower() < other.text(column).toLower();
+        else return false;
     }
 
 private:

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index fe7bd46d8058ddc9727a12291d578a530ee49694..10a838304d9d7a69ec44ebfd9360ef935f222e3d 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -1004,7 +1004,7 @@ void ProjectList::slotProcessNextThumbnail()
     }
     if (m_thumbnailQueue.count() > 1) {
         int max = m_doc->clipManager()->clipsCount();
-        emit displayMessage(i18n("Loading thumbnails"), (int)(100 * (max - m_thumbnailQueue.count()) / max));
+        emit displayMessage(i18n("Loading thumbnails"), (int)(100 *(max - m_thumbnailQueue.count()) / max));
     }
     slotRefreshClipThumbnail(m_thumbnailQueue.takeFirst(), false);
 }
@@ -1082,7 +1082,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
         }
     } else kDebug() << "////////  COULD NOT FIND CLIP TO UPDATE PRPS...";
     int max = m_doc->clipManager()->clipsCount();
-    emit displayMessage(i18n("Loading clips"), (int)(100 * (max - m_infoQueue.count()) / max));
+    emit displayMessage(i18n("Loading clips"), (int)(100 *(max - m_infoQueue.count()) / max));
     // small delay so that the app can display the progress info
     if (item && m_infoQueue.isEmpty() && m_thumbnailQueue.isEmpty()) {
         m_listView->setCurrentItem(item);

diff --git a/src/subprojectitem.h b/src/subprojectitem.h
index e38846f58ef02a19e0fcb1ce91cf8d46c3685729..d689c6e959d828134d22ef9aa7a9bcfaf4119d91 100644 (file)
--- a/src/subprojectitem.h
+++ b/src/subprojectitem.h
@@ -47,10 +47,10 @@ public:
 
     /** Make sure folders appear on top of the tree widget */
     virtual bool operator<(const QTreeWidgetItem &other)const {
-       int column = treeWidget()->sortColumn();
-       if (other.type() != PROJECTFOLDERTYPE)
-         return text(column).toLower() < other.text(column).toLower();
-       else return false;
+        int column = treeWidget()->sortColumn();
+        if (other.type() != PROJECTFOLDERTYPE)
+            return text(column).toLower() < other.text(column).toLower();
+        else return false;
     }
 
 private:

diff --git a/src/transition.cpp b/src/transition.cpp
index a322f068dc204727308e738cc706e8e19e58d76e..315d501cbc1deafa0ffdf38f23491829211df002 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -231,7 +231,7 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value
 
         if (!items.isEmpty()) {
             for (int i = 0; i < items.count(); i++) {
-               if (!items.at(i)->isEnabled()) continue;
+                if (!items.at(i)->isEnabled()) continue;
                 if (items.at(i)->type() == type()) {
                     // Collision! Don't move.
                     //kDebug()<<"/// COLLISION WITH ITEM: "<<items.at(i)->boundingRect()<<", POS: "<<items.at(i)->pos()<<", ME: "<<newPos;

diff --git a/src/videoglwidget.cpp b/src/videoglwidget.cpp
index 8fa6b344230261f68a3fbef14cd84e40123b812a..36eec01e8f3003ced015c04aa6e06474423b86b4 100644 (file)
--- a/src/videoglwidget.cpp
+++ b/src/videoglwidget.cpp
@@ -8,12 +8,12 @@
 #endif
 
 VideoGLWidget::VideoGLWidget(QWidget *parent)
- : QGLWidget(parent)
- , m_image_width(0)
- , m_image_height(0)
- , m_texture(0)
- , m_display_ratio(4.0/3.0)
- , m_backgroundColor(Qt::gray)
+        : QGLWidget(parent)
+        , m_image_width(0)
+        , m_image_height(0)
+        , m_texture(0)
+        , m_display_ratio(4.0 / 3.0)
+        , m_backgroundColor(Qt::gray)
 {
 }
 
@@ -52,19 +52,15 @@ void VideoGLWidget::resizeGL(int width, int height)
 
     // Special case optimisation to negate odd effect of sample aspect ratio
     // not corresponding exactly with image resolution.
-    if ((int)(this_aspect * 1000) == (int)(m_display_ratio * 1000))
-    {
+    if ((int)(this_aspect * 1000) == (int)(m_display_ratio * 1000)) {
         w = width;
         h = height;
     }
     // Use OpenGL to normalise sample aspect ratio
-    else if (height * m_display_ratio > width)
-    {
+    else if (height * m_display_ratio > width) {
         w = width;
         h = width / m_display_ratio;
-    }
-    else
-    {
+    } else {
         w = height * m_display_ratio;
         h = height;
     }
@@ -81,18 +77,17 @@ void VideoGLWidget::resizeGL(int width, int height)
 void VideoGLWidget::paintGL()
 {
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    if (m_texture)
-    {
+    if (m_texture) {
         glEnable(GL_TEXTURE_RECTANGLE_EXT);
         glBegin(GL_QUADS);
-            glTexCoord2i(0, 0);
-            glVertex2i(x, y);
-            glTexCoord2i(m_image_width, 0);
-            glVertex2i(x + w, y);
-            glTexCoord2i(m_image_width, m_image_height);
-            glVertex2i(x + w, y + h);
-            glTexCoord2i(0, m_image_height);
-            glVertex2i(x, y + h);
+        glTexCoord2i(0, 0);
+        glVertex2i(x, y);
+        glTexCoord2i(m_image_width, 0);
+        glVertex2i(x + w, y);
+        glTexCoord2i(m_image_width, m_image_height);
+        glVertex2i(x + w, y + h);
+        glTexCoord2i(0, m_image_height);
+        glVertex2i(x, y + h);
         glEnd();
         glDisable(GL_TEXTURE_RECTANGLE_EXT);
     }
@@ -112,6 +107,6 @@ void VideoGLWidget::showImage(QImage image)
     glTexParameteri(GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameterf(GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexImage2D(GL_TEXTURE_RECTANGLE_EXT, 0, GL_RGBA8, m_image_width, m_image_height, 0, GL_RGBA,
-        GL_UNSIGNED_BYTE, image.bits());
+                 GL_UNSIGNED_BYTE, image.bits());
     updateGL();
 }

diff --git a/thumbnailer/westleypreview.cpp b/thumbnailer/westleypreview.cpp
index d9036031acf0940f2b6004440d621ade16487530..ceb77b352903f5649e3def7f03965627e677c32d 100644 (file)
--- a/thumbnailer/westleypreview.cpp
+++ b/thumbnailer/westleypreview.cpp
@@ -40,8 +40,7 @@
 #define DBG_AREA
 
 //#include "config.h"
-extern "C"
-{
+extern "C" {
     KDE_EXPORT ThumbCreator *new_creator() {
         return new MltPreview;
     }