Reindent sources

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

diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp
index 584ffab2bd3cddf925245ba95663e8188a7974d0..5bb88b982fce697cc302369f76dd2d7bc164d7dd 100644 (file)
--- a/src/abstractclipitem.cpp
+++ b/src/abstractclipitem.cpp
@@ -32,7 +32,7 @@
 AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect, double fps) :
         QObject(),
         QGraphicsRectItem(rect),
-       m_info(info),
+        m_info(info),
         m_editedKeyframe(-1),
         m_selectedKeyframe(0),
         m_keyframeFactor(1),
@@ -100,11 +100,11 @@ void AbstractClipItem::resizeStart(int posx, double speed)
     }
     //kDebug()<<"// DURATION DIFF: "<<durationDiff.frames(25)<<", POS: "<<pos().x();
     m_info.startPos += durationDiff;
-    GenTime originalDiff = GenTime((int) (durationDiff.frames(m_fps) * speed + 0.5), m_fps); 
-    
+    GenTime originalDiff = GenTime((int)(durationDiff.frames(m_fps) * speed + 0.5), m_fps);
+
     if (type() == AVWIDGET) {
-       m_info.cropStart += durationDiff;
-       m_info.originalcropStart += originalDiff;
+        m_info.cropStart += durationDiff;
+        m_info.originalcropStart += originalDiff;
     }
     m_info.cropDuration = m_info.cropDuration - originalDiff;
 
@@ -114,11 +114,11 @@ void AbstractClipItem::resizeStart(int posx, double speed)
     if ((int) scenePos().x() != posx) {
         //kDebug()<<"//////  WARNING, DIFF IN XPOS: "<<pos().x()<<" == "<<m_startPos.frames(m_fps);
         GenTime diff = GenTime((int) pos().x() - posx, m_fps);
-       GenTime originalDiff = GenTime((int) (diff.frames(m_fps) * speed + 0.5), m_fps); 
+        GenTime originalDiff = GenTime((int)(diff.frames(m_fps) * speed + 0.5), m_fps);
         if (type() == AVWIDGET) {
-           m_info.cropStart += diff;
-           m_info.originalcropStart += originalDiff;
-       }
+            m_info.cropStart += diff;
+            m_info.originalcropStart += originalDiff;
+        }
         m_info.cropDuration = m_info.cropDuration - originalDiff;
         setRect(0, 0, cropDuration().frames(m_fps) - 0.02, rect().height());
         //kDebug()<<"// NEW START: "<<m_startPos.frames(25)<<", NW DUR: "<<m_cropDuration.frames(25);
@@ -155,7 +155,7 @@ void AbstractClipItem::resizeEnd(int posx, double speed)
         durationDiff = GenTime() - (cropDuration() - GenTime(3, m_fps));
     }
     //kDebug() << "// DUR DIFF2:" << durationDiff.frames(25) << ", ADJUSTED: " << durationDiff.frames(25) * speed << ", SPED:" << speed;
-    m_info.cropDuration += GenTime((int) (durationDiff.frames(m_fps) * speed + 0.5), m_fps);
+    m_info.cropDuration += GenTime((int)(durationDiff.frames(m_fps) * speed + 0.5), m_fps);
     setRect(0, 0, cropDuration().frames(m_fps) - 0.02, rect().height());
     if (durationDiff > GenTime()) {
         QList <QGraphicsItem *> collisionList = collidingItems(Qt::IntersectsItemBoundingRect);
@@ -166,7 +166,7 @@ void AbstractClipItem::resizeEnd(int posx, double speed)
                 kDebug() << "/////////  CURRENT: " << startPos().frames(25) << "x" << endPos().frames(25) << ", RECT: " << rect() << "-" << pos();
                 kDebug() << "/////////  COLLISION: " << ((AbstractClipItem *)item)->startPos().frames(25) << "x" << ((AbstractClipItem *)item)->endPos().frames(25) << ", RECT: " << ((AbstractClipItem *)item)->rect() << "-" << item->pos();*/
                 GenTime diff = ((AbstractClipItem *)item)->startPos() - GenTime(1, m_fps) - startPos();
-                m_info.cropDuration = GenTime((int) (diff.frames(m_fps) * speed + 0.5), m_fps);
+                m_info.cropDuration = GenTime((int)(diff.frames(m_fps) * speed + 0.5), m_fps);
                 setRect(0, 0, cropDuration().frames(m_fps) - 0.02, rect().height());
                 break;
             }

diff --git a/src/abstractclipitem.h b/src/abstractclipitem.h
index 129011a6b300eedbb43aef677443e17088344385..79072ea5f6ada2dad26879464e40ffb3f4e757e3 100644 (file)
--- a/src/abstractclipitem.h
+++ b/src/abstractclipitem.h
@@ -61,14 +61,14 @@ public:
     virtual GenTime maxDuration() const;
     virtual void setCropStart(GenTime pos);
 
-protected:    
+protected:
     ItemInfo m_info;
 //    int m_track;
     int m_editedKeyframe;
     int m_selectedKeyframe;
-/*    GenTime m_cropStart;
-    GenTime m_cropDuration;
-    GenTime m_startPos;*/
+    /*    GenTime m_cropStart;
+        GenTime m_cropDuration;
+        GenTime m_startPos;*/
     GenTime m_maxDuration;
     QMap <int, int> m_keyframes;
     double m_keyframeFactor;

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 87ea7ea48cdc019ffc38a278f525a8c92f3e8754..f5fc70ade392402f442bc363fffefde53cfc20d6 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -771,7 +771,7 @@ void ClipItem::paint(QPainter *painter,
     pen.setStyle(Qt::DotLine);
     painter->setPen(pen);
     for (; it != markers.end(); ++it) {
-        pos = GenTime((int) ((*it).time().frames(m_fps) / m_speed + 0.5), m_fps) - cropStart();
+        pos = GenTime((int)((*it).time().frames(m_fps) / m_speed + 0.5), m_fps) - cropStart();
         if (pos > GenTime()) {
             if (pos > cropDuration()) break;
             QLineF l(rect().x() + pos.frames(m_fps), rect().y(), rect().x() + pos.frames(m_fps), rect().bottom());
@@ -890,8 +890,8 @@ QList <GenTime> ClipItem::snapMarkers() const
     GenTime pos;
 
     for (int i = 0; i < markers.size(); i++) {
-      
-        pos = GenTime((int) (markers.at(i).frames(m_fps) / m_speed + 0.5), m_fps) - cropStart();
+
+        pos = GenTime((int)(markers.at(i).frames(m_fps) / m_speed + 0.5), m_fps) - cropStart();
         if (pos > GenTime()) {
             if (pos > cropDuration()) break;
             else snaps.append(pos + startPos());
@@ -907,7 +907,7 @@ QList <CommentedTime> ClipItem::commentedSnapMarkers() const
     GenTime pos;
 
     for (int i = 0; i < markers.size(); i++) {
-        pos = GenTime((int) (markers.at(i).time().frames(m_fps) / m_speed + 0.5), m_fps) - cropStart();
+        pos = GenTime((int)(markers.at(i).time().frames(m_fps) / m_speed + 0.5), m_fps) - cropStart();
         if (pos > GenTime()) {
             if (pos > cropDuration()) break;
             else snaps.append(CommentedTime(pos + startPos(), markers.at(i).comment()));
@@ -1490,17 +1490,17 @@ void ClipItem::setSpeed(const double speed, const int strobe)
 
 GenTime ClipItem::maxDuration() const
 {
-    return GenTime((int) (m_maxDuration.frames(m_fps) / m_speed + 0.5), m_fps);
+    return GenTime((int)(m_maxDuration.frames(m_fps) / m_speed + 0.5), m_fps);
 }
 
 GenTime ClipItem::cropStart() const
 {
-    return GenTime((int) (m_info.originalcropStart.frames(m_fps) / m_speed + 0.5), m_fps);
+    return GenTime((int)(m_info.originalcropStart.frames(m_fps) / m_speed + 0.5), m_fps);
 }
 
 GenTime ClipItem::cropDuration() const
 {
-    return GenTime((int) (m_info.cropDuration.frames(m_fps) / m_speed + 0.5), m_fps);
+    return GenTime((int)(m_info.cropDuration.frames(m_fps) / m_speed + 0.5), m_fps);
 }
 
 GenTime ClipItem::endPos() const

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index 5465081edfdcc187e98ec15a77616383996571f5..0e8133f459a33dea7f56ce6d66a6091741c403e8 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -152,7 +152,7 @@ void ClipManager::slotDeleteClips(QStringList ids)
 {
     QUndoCommand *delClips = new QUndoCommand();
     delClips->setText(i18np("Delete clip", "Delete clips", ids.size()));
-    
+
     for (int i = 0; i < ids.size(); i++) {
         DocClipBase *clip = getClipById(ids.at(i));
         if (clip) {

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index b878fc1523fe80c38934eabef3609974a384b816..170fe4eb16b945141fa5c8174e83079a2cff2f7e 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -875,13 +875,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
 
     m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
     m_operationMode = m_dragItem->operationMode(mapToScene(event->pos()));
-    
+
     // Update snap points
     if (m_selectionGroup == NULL) {
-       if (m_operationMode == RESIZEEND || m_operationMode == RESIZESTART) updateSnapPoints(NULL);
-       else updateSnapPoints(m_dragItem);
-    }
-    else {
+        if (m_operationMode == RESIZEEND || m_operationMode == RESIZESTART) updateSnapPoints(NULL);
+        else updateSnapPoints(m_dragItem);
+    } else {
         QList <GenTime> offsetList;
         QList<QGraphicsItem *> children = m_selectionGroup->childItems();
         for (int i = 0; i < children.count(); i++) {
@@ -1228,14 +1227,14 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos)
         info.startPos = GenTime();
         info.cropStart = GenTime(list.at(1).toInt(), m_document->fps());
         info.endPos = GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps());
-       info.cropDuration = info.endPos - info.startPos;
-       info.originalcropStart = info.cropStart;
+        info.cropDuration = info.endPos - info.startPos;
+        info.originalcropStart = info.cropStart;
         info.track = 0;
 
         // Check if clip can be inserted at that position
         ItemInfo pasteInfo = info;
         pasteInfo.startPos = GenTime((int)(framePos.x() + 0.5), m_document->fps());
-       pasteInfo.endPos = pasteInfo.startPos + info.endPos;
+        pasteInfo.endPos = pasteInfo.startPos + info.endPos;
         pasteInfo.track = (int)(framePos.y() / m_tracksHeight);
         if (!canBePastedTo(pasteInfo, AVWIDGET)) {
             return true;
@@ -1272,7 +1271,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos)
             }
             ItemInfo info;
             info.startPos = start;
-           info.cropDuration = clip->duration();
+            info.cropDuration = clip->duration();
             info.endPos = info.startPos + info.cropDuration;
             info.track = track;
             infoList.append(info);
@@ -1287,7 +1286,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos)
             DocClipBase *clip = m_document->getBaseClip(ids.at(i));
             ItemInfo info;
             info.startPos = start;
-           info.cropDuration = clip->duration();
+            info.cropDuration = clip->duration();
             info.endPos = info.startPos + info.cropDuration;
             info.track = 0;
             start += info.cropDuration;

diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp
index d5339ab647034671f0ec82a19471221583883549..3221ef8ee9ed68795318f8348f70325980016c35 100644 (file)
--- a/src/docclipbase.cpp
+++ b/src/docclipbase.cpp
@@ -386,7 +386,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/mainwindow.cpp b/src/mainwindow.cpp
index 6b78ed7eaaee8d93be9baadc5e05c8767832abba..669999422812694e0755741bb7778f1610695eb6 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -856,7 +856,7 @@ void MainWindow::setupActions()
     KAction* projectClean = new KAction(KIcon("edit-clear"), i18n("Clean Project"), this);
     collection->addAction("project_clean", projectClean);
     connect(projectClean, SIGNAL(triggered(bool)), this, SLOT(slotCleanProject()));
-    
+
     KAction* monitorPlay = new KAction(KIcon("media-playback-start"), i18n("Play"), this);
     KShortcut playShortcut;
     playShortcut.setPrimary(Qt::Key_Space);
@@ -1846,7 +1846,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
     connect(m_projectList, SIGNAL(loadingIsOver()), trackView->projectView(), SLOT(slotUpdateAllThumbs()));
     connect(m_projectList, SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType)));
 
-    
+
     trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup);
     m_activeTimeline = trackView;
     if (m_renderWidget) {
@@ -1993,7 +1993,7 @@ void MainWindow::slotAddClipMarker()
         if (m_activeTimeline) {
             ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor();
             if (item) {
-                pos = GenTime((int) ((m_projectMonitor->position() - item->startPos() + item->cropStart()).frames(m_activeDocument->fps()) * item->speed() + 0.5), m_activeDocument->fps());
+                pos = GenTime((int)((m_projectMonitor->position() - item->startPos() + item->cropStart()).frames(m_activeDocument->fps()) * item->speed() + 0.5), m_activeDocument->fps());
                 clip = item->baseClip();
             }
         }

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 7fcdf070e758a22194f6281ea8293b304761232e..a6b75dd5ee80c49dd7e8199b96e3125fa1941411 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -195,8 +195,8 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe
 
     //TODO: add save zone to timeline monitor when fixed
     if (m_name == "clip") {
-       m_contextMenu->addMenu(m_markerMenu);
-       m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone()));
+        m_contextMenu->addMenu(m_markerMenu);
+        m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone()));
     }
     QAction *extractFrame = m_configMenu->addAction(KIcon("document-new"), i18n("Extract frame"), this, SLOT(slotExtractCurrentFrame()));
     m_contextMenu->addAction(extractFrame);
@@ -486,7 +486,7 @@ void Monitor::slotSetThumbFrame()
 void Monitor::slotExtractCurrentFrame()
 {
     QImage frame = render->extractFrame(render->seekFramePosition());
-    KFileDialog *fs = new KFileDialog(KUrl(), "image/png",this);
+    KFileDialog *fs = new KFileDialog(KUrl(), "image/png", this);
     fs->setOperationMode(KFileDialog::Saving);
     fs->setMode(KFile::File);
 #if KDE_IS_VERSION(4,2,0)
@@ -750,7 +750,7 @@ void Monitor::slotSetXml(DocClipBase *clip, const int position)
     }
     if (clip != m_currentClip) {
         m_currentClip = clip;
-        updateMarkers(clip);        
+        updateMarkers(clip);
         if (render->setProducer(clip->producer(), position) == -1) {
             // MLT CONSUMER is broken
             emit blockMonitors();

diff --git a/src/projectlist.h b/src/projectlist.h
index f7389a24eb424ff235e4fe9e061ba9f3aa4a4643..d7beae4ff5a064ab487ed5d307c690272f149701 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -71,9 +71,9 @@ public:
       extendItem(w,
     }
     */
-    void drawFocus ( QPainter *, const QStyleOptionViewItem &, const QRect & ) const {
+    void drawFocus(QPainter *, const QStyleOptionViewItem &, const QRect &) const {
     }
-    
+
     void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const {
         if (index.column() == 1) {
             QRect r1 = option.rect;

diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp
index bbbda12e3f41f3626fd9b89d6ae3548ceb9fff8c..ebd4bbc14b0bd29048203ea236a3af6e17749dbc 100644 (file)
--- a/src/projectsettings.cpp
+++ b/src/projectsettings.cpp
@@ -68,8 +68,7 @@ ProjectSettings::ProjectSettings(ClipManager *manager, int videotracks, int audi
         slotUpdateFiles();
         connect(clear_cache, SIGNAL(clicked()), this, SLOT(slotClearCache()));
         connect(delete_unused, SIGNAL(clicked()), this, SLOT(slotDeleteUnused()));
-    }
-    else tabWidget->widget(1)->setEnabled(false);
+    } else tabWidget->widget(1)->setEnabled(false);
     connect(profiles_list, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateDisplay()));
     connect(project_folder, SIGNAL(textChanged(const QString &)), this, SLOT(slotUpdateButton(const QString &)));
 }
@@ -109,8 +108,8 @@ void ProjectSettings::slotClearCache()
 }
 
 void ProjectSettings::slotUpdateFiles(bool cacheOnly)
-{   
-    KIO::DirectorySizeJob * job = KIO::directorySize( project_folder->url().path(KUrl::AddTrailingSlash) + "thumbs/" );
+{
+    KIO::DirectorySizeJob * job = KIO::directorySize(project_folder->url().path(KUrl::AddTrailingSlash) + "thumbs/");
     job->exec();
     thumbs_count->setText(QString::number(job->totalFiles()));
     thumbs_size->setText(KIO::convertSize(job->totalSize()));
@@ -127,8 +126,7 @@ void ProjectSettings::slotUpdateFiles(bool cacheOnly)
         if (clip->numReferences() == 0) {
             unused++;
             unUsedSize += clip->fileSize();
-        }
-        else {
+        } else {
             used++;
             usedSize += clip->fileSize();
         }

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index c5a3d8a40a118add81cd2334c301396ee7623658..e21aed9d9fa3812e6f56e064e7d39a84ab18bb15 100644 (file)
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -153,8 +153,8 @@ void RecMonitor::slotUpdateCaptureFolder()
 {
     if (m_captureProcess) m_captureProcess->setWorkingDirectory(KdenliveSettings::capturefolder());
     slotVideoDeviceChanged(m_ui.device_selector->currentIndex());
-    kDebug()<<"// UPDATE CAPT FOLD: "<<KdenliveSettings::capturefolder();
-    
+    kDebug() << "// UPDATE CAPT FOLD: " << KdenliveSettings::capturefolder();
+
 #if KDE_IS_VERSION(4,2,0)
     // update free space info
     updatedFreeSpace();
@@ -587,11 +587,11 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status)
             else m_ui.video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", KdenliveSettings::capturefolder())));
         }
         m_isCapturing = false;
-        
+
 #if KDE_IS_VERSION(4,2,0)
         // update free space info
         KDiskFreeSpaceInfo info = KDiskFreeSpaceInfo::freeSpaceInfo(KdenliveSettings::capturefolder());
-        if( info.isValid() ) {
+        if (info.isValid()) {
             m_freeSpace->setValue(100 * info.used() / info.size());
             m_freeSpace->setText(i18n("Free space: %1", KIO::convertSize(info.available())));
         }
@@ -647,7 +647,7 @@ void RecMonitor::manageCapturedFiles()
 
 // virtual
 void RecMonitor::mousePressEvent(QMouseEvent * /*event*/)
-{   
+{
 #if KDE_IS_VERSION(4,2,0)
     if (m_freeSpace->underMouse()) updatedFreeSpace();
 #endif
@@ -657,7 +657,7 @@ void RecMonitor::mousePressEvent(QMouseEvent * /*event*/)
 void RecMonitor::updatedFreeSpace()
 {
     KDiskFreeSpaceInfo info = KDiskFreeSpaceInfo::freeSpaceInfo(KdenliveSettings::capturefolder());
-    if( info.isValid() ) {
+    if (info.isValid()) {
         m_freeSpace->setValue(100 * info.used() / info.size());
         m_freeSpace->setText(i18n("Free space: %1", KIO::convertSize(info.available())));
         m_freeSpace->update();

diff --git a/src/recmonitor.h b/src/recmonitor.h
index 9c284e79b1d86c2083e36c948cf18158d631625b..a7159d4c585887ff6abe8f5a60acc80cbae53639 100644 (file)
--- a/src/recmonitor.h
+++ b/src/recmonitor.h
@@ -58,7 +58,7 @@ private:
     QString m_name;
     bool m_isActive;
     KDateTime m_captureTime;
-    
+
 #if KDE_IS_VERSION(4,2,0)
     KCapacityBar *m_freeSpace;
 #endif
@@ -84,7 +84,7 @@ private:
     void checkDeviceAvailability();
     QPixmap mergeSideBySide(const QPixmap& pix, const QString txt);
     void manageCapturedFiles();
-    
+
 #if KDE_IS_VERSION(4,2,0)
     void updatedFreeSpace();
 #endif

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 733224cc8628c98c3f6bc2ddbd23ac523b58572f..d4ae97559cb458e20382927add81f2f93ea70f79 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -958,7 +958,7 @@ int Render::setSceneList(QString playlist, int position)
                 if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
                 trackNb--;
             }
-           delete field;
+            delete field;
         }
         mlt_service_unlock(service.get_service());
 
@@ -1710,7 +1710,7 @@ void Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr
         }
         ct++;
         filter = sourceService.filter(ct);
-    }    
+    }
     mltRemoveClip(info.track, info.startPos);
     mltInsertClip(info, element, prod);
     if (!filtersList.isEmpty()) {
@@ -2067,7 +2067,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int
 
         Mlt::Producer *cut;
         GenTime duration = info.cropDuration;
-       int originalStart = (int)(info.originalcropStart.frames(m_fps));
+        int originalStart = (int)(info.originalcropStart.frames(m_fps));
         if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + info.cropDuration).frames(m_fps) > blankEnd) {
             GenTime maxLength = GenTime(blankEnd, m_fps) - info.startPos;
             cut = prod->cut(originalStart, (int)(originalStart + maxLength.frames(m_fps) - 1));
@@ -2104,9 +2104,9 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int
         }
         Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
         trackPlaylist.consolidate_blanks(0);
-       
-       GenTime duration = info.cropDuration / speed;
-       int originalStart = (int)(info.originalcropStart.frames(m_fps) / speed);
+
+        GenTime duration = info.cropDuration / speed;
+        int originalStart = (int)(info.originalcropStart.frames(m_fps) / speed);
 
         // Check that the blank space is long enough for our new duration
         clipIndex = trackPlaylist.get_clip_index_at(startPos);
@@ -2764,9 +2764,9 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn
 
             // move all effects to the correct producer
             mltPasteEffects(clipProducer, clip);
-            
+
             int newIndex = destTrackPlaylist.insert_at(moveEnd, clip, 1);
-            
+
             if (clip == clipProducer) {
                 delete clip;
                 clip = NULL;

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index 6894de120a5b6d93e0c42ec054cceef0e48d4bb2..8c3906fb6762f808bdd86f84c685a38d6e3db710 100644 (file)
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -1154,8 +1154,8 @@ void RenderWidget::parseFile(QString exportFile, bool editable)
     const QStringList acodecsList = KdenliveSettings::audiocodecs();
     bool replaceVorbisCodec = false;
     if (!acodecsList.contains("vorbis") && acodecsList.contains("libvorbis")) replaceVorbisCodec = true;
-       bool replaceLibfaacCodec = false;
-       if (!acodecsList.contains("libfaac") && acodecsList.contains("aac")) replaceLibfaacCodec = true;
+    bool replaceLibfaacCodec = false;
+    if (!acodecsList.contains("libfaac") && acodecsList.contains("aac")) replaceLibfaacCodec = true;
 
 
     if (editable || groups.count() == 0) {
@@ -1209,10 +1209,10 @@ void RenderWidget::parseFile(QString exportFile, bool editable)
                 // replace vorbis with libvorbis
                 params = params.replace("vorbis", "libvorbis");
             }
-                       if (replaceLibfaacCodec && params.contains("acodec=libfaac")) {
-                               // replace libfaac with aac
-                               params = params.replace("libfaac", "aac");
-                       }
+            if (replaceLibfaacCodec && params.contains("acodec=libfaac")) {
+                // replace libfaac with aac
+                params = params.replace("libfaac", "aac");
+            }
 
             QString category = profile.attribute("category", i18n("Custom"));
             QString dest = profile.attribute("destinationid");
@@ -1325,12 +1325,12 @@ void RenderWidget::parseFile(QString exportFile, bool editable)
                 // replace vorbis with libvorbis
                 params = params.replace("vorbis", "libvorbis");
             }
-                       if (replaceLibfaacCodec && params.contains("acodec=libfaac")) {
-                               // replace libfaac with aac
-                               params = params.replace("libfaac", "aac");
-                       }
+            if (replaceLibfaacCodec && params.contains("acodec=libfaac")) {
+                // replace libfaac with aac
+                params = params.replace("libfaac", "aac");
+            }
 
-                       prof_extension = profileElement.attribute("extension");
+            prof_extension = profileElement.attribute("extension");
             if (!prof_extension.isEmpty()) extension = prof_extension;
             item = new QListWidgetItem(profileName, m_view.size_list);
             item->setData(GroupRole, groupName);

diff --git a/src/smallruler.cpp b/src/smallruler.cpp
index de1e2119b08839e981f52a9838506cc4fe08f197..9097fe90d7afefbbe7a07840799d07abfeb3e57d 100644 (file)
--- a/src/smallruler.cpp
+++ b/src/smallruler.cpp
@@ -138,7 +138,7 @@ void SmallRuler::updatePixmap()
     const int zoneStart = (int)(m_zoneStart * m_scale);
     const int zoneEnd = (int)(m_zoneEnd * m_scale);
     p.fillRect(zoneStart, height() / 2 - 1, zoneEnd - zoneStart, height() / 2, m_zoneColor);
-    
+
     // draw markers
     if (!m_markers.isEmpty()) {
         p.setPen(Qt::red);
@@ -150,14 +150,14 @@ void SmallRuler::updatePixmap()
     // draw the little marks
     fend = m_scale * m_small;
     if (fend > 2) for (f = 0; f < width(); f += fend) {
-        p.drawLine((int)f, 0, (int)f, 3);
-    }
+            p.drawLine((int)f, 0, (int)f, 3);
+        }
 
     // draw medium marks
     fend = m_scale * m_medium;
     if (fend > 2) for (f = 0; f < width(); f += fend) {
-        p.drawLine((int)f, 0, (int)f, 6);
-    }
+            p.drawLine((int)f, 0, (int)f, 6);
+        }
     p.end();
     update();
 }

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 998b3212f451d23f994e20324d76f5fa0463693c..1b0f79e3777503f57af2335ec833f5796ba327e4 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -1448,7 +1448,7 @@ void TitleWidget::saveTitle(KUrl url)
     if (anim_start->isChecked()) slotAnimStart(false);
     if (anim_end->isChecked()) slotAnimEnd(false);
     if (url.isEmpty()) {
-        KFileDialog *fs = new KFileDialog(KUrl(m_projectTitlePath), "application/x-kdenlivetitle",this);
+        KFileDialog *fs = new KFileDialog(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this);
         fs->setOperationMode(KFileDialog::Saving);
         fs->setMode(KFile::File);
 #if KDE_IS_VERSION(4,2,0)

diff --git a/src/trackview.cpp b/src/trackview.cpp
index 85de754ca0bcdea23a108821a7cd27891c508ea9..0821bcb77aefe7c7b921bc113f839a48158999f6 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -561,9 +561,9 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
                 clipinfo.startPos = GenTime(position, m_doc->fps());
                 clipinfo.endPos = clipinfo.startPos + GenTime(out - in + 1, m_doc->fps());
                 clipinfo.cropStart = GenTime(in, m_doc->fps());
-               clipinfo.cropDuration = GenTime((int) ((clipinfo.endPos - clipinfo.startPos).frames(m_doc->fps()) * speed + 0.5), m_doc->fps());
-               clipinfo.originalcropStart = GenTime((int) ((clipinfo.cropStart).frames(m_doc->fps()) * speed + 0.5), m_doc->fps());
-               
+                clipinfo.cropDuration = GenTime((int)((clipinfo.endPos - clipinfo.startPos).frames(m_doc->fps()) * speed + 0.5), m_doc->fps());
+                clipinfo.originalcropStart = GenTime((int)((clipinfo.cropStart).frames(m_doc->fps()) * speed + 0.5), m_doc->fps());
+
                 clipinfo.track = ix;
                 //kDebug() << "// INSERTING CLIP: " << in << "x" << out << ", track: " << ix << ", ID: " << id << ", SCALE: " << m_scale << ", FPS: " << m_doc->fps();
                 ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), speed, strobe, false);