Const'ify/ref + fix indent

diff --git a/renderer/kdenlive_render.cpp b/renderer/kdenlive_render.cpp
index 5f0240bff370c1a2e6280d3f54258cf13bb1bd09..593d002c367df9ce5968b01754ff0bdb0676a9ba 100644 (file)
--- a/renderer/kdenlive_render.cpp
+++ b/renderer/kdenlive_render.cpp
@@ -69,11 +69,12 @@ int main(int argc, char **argv)
         QString profile = args.takeFirst();
         QString rendermodule = args.takeFirst();
         QString player = args.takeFirst();
-       QByteArray srcString = args.takeFirst().toUtf8();
-       QUrl srcurl = QUrl::fromEncoded(srcString);
+        QByteArray srcString = args.takeFirst().toUtf8();
+        QUrl srcurl = QUrl::fromEncoded(srcString);
         QString src = srcurl.path();
-       // The QUrl path() strips the consumer: protocol, so re-add it if necessary
-       if (srcString.startsWith("consumer:")) src.prepend("consumer:");
+        // The QUrl path() strips the consumer: protocol, so re-add it if necessary
+        if (srcString.startsWith("consumer:"))
+            src.prepend("consumer:");
         QUrl desturl = QUrl::fromEncoded(args.takeFirst().toUtf8());
         QString dest = desturl.path();
         bool dualpass = false;
@@ -101,12 +102,12 @@ int main(int argc, char **argv)
         }
         
         // Decode metadata
-        for (int i = 0; i < args.count(); i++) {
-           if (args.at(i).startsWith("meta.attr")) {
-               QString data = args.at(i);
-               args.replace(i, data.section('=', 0, 0) + "=\"" + QUrl::fromPercentEncoding(data.section('=', 1).toUtf8()) + "\"");
-           }
-       }
+        for (int i = 0; i < args.count(); ++i) {
+            if (args.at(i).startsWith("meta.attr")) {
+                QString data = args.at(i);
+                args.replace(i, data.section('=', 0, 0) + "=\"" + QUrl::fromPercentEncoding(data.section('=', 1).toUtf8()) + "\"");
+            }
+        }
 
         qDebug() << "//STARTING RENDERING: " << erase << "," << usekuiserver << "," << render << "," << profile << "," << rendermodule << "," << player << "," << src << "," << dest << "," << preargs << "," << args << "," << in << "," << out ;
         RenderJob *job = new RenderJob(doerase, usekuiserver, pid, render, profile, rendermodule, player, src, dest, preargs, args, in, out);

diff --git a/src/effectstack/collapsibleeffect.cpp b/src/effectstack/collapsibleeffect.cpp
index 194c25cdd871341b29f5e2595ddbd3abf5e9dee9..c2a59f7a41e2d30ef667f956649f4aeaaf80d2e5 100644 (file)
--- a/src/effectstack/collapsibleeffect.cpp
+++ b/src/effectstack/collapsibleeffect.cpp
@@ -42,16 +42,16 @@
 
 
 CollapsibleEffect::CollapsibleEffect(const QDomElement &effect, const QDomElement &original_effect, const ItemInfo &info, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent) :
-        AbstractCollapsibleWidget(parent),
-        m_paramWidget(NULL),
-        m_effect(effect),
-        m_original_effect(original_effect),
-        m_lastEffect(lastEffect),
-        m_regionEffect(false)
+    AbstractCollapsibleWidget(parent),
+    m_paramWidget(NULL),
+    m_effect(effect),
+    m_original_effect(original_effect),
+    m_lastEffect(lastEffect),
+    m_regionEffect(false)
 {
     if (m_effect.attribute("tag") == "region") {
-       m_regionEffect = true;
-       decoframe->setObjectName("decoframegroup");
+        m_regionEffect = true;
+        decoframe->setObjectName("decoframegroup");
     }
     filterWheelEvent = true;
     m_info.fromString(effect.attribute("kdenlive_info"));
@@ -87,12 +87,12 @@ CollapsibleEffect::CollapsibleEffect(const QDomElement &effect, const QDomElemen
     
     QDomElement namenode = m_effect.firstChildElement("name");
     if (namenode.isNull()) {
-       // Warning, broken effect?
-       kDebug()<<"// Could not create effect";
-       return;
+        // Warning, broken effect?
+        kDebug()<<"// Could not create effect";
+        return;
     }
     QString effectname = i18n(namenode.text().toUtf8().data());
-    if (m_regionEffect) effectname.append(':' + KUrl(EffectsList::parameter(m_effect, "resource")).fileName());    
+    if (m_regionEffect) effectname.append(':' + KUrl(EffectsList::parameter(m_effect, "resource")).fileName());
     title->setText(effectname);
     /*
      * Do not show icon, makes too much visual noise
@@ -105,8 +105,8 @@ CollapsibleEffect::CollapsibleEffect(const QDomElement &effect, const QDomElemen
     effecticon->setPixmap(icon.pixmap(16,16));*/
 
     if (!m_regionEffect) {
-       if (m_info.groupIndex == -1) m_menu->addAction(m_groupAction);
-       m_menu->addAction(KIcon("folder-new"), i18n("Create Region"), this, SLOT(slotCreateRegion()));
+        if (m_info.groupIndex == -1) m_menu->addAction(m_groupAction);
+        m_menu->addAction(KIcon("folder-new"), i18n("Create Region"), this, SLOT(slotCreateRegion()));
     }
     setupWidget(info, metaInfo);
     setAcceptDrops(true);
@@ -115,12 +115,12 @@ CollapsibleEffect::CollapsibleEffect(const QDomElement &effect, const QDomElemen
     
     if (m_effect.attribute("disable") == "1") {
         title->setEnabled(false);
-       enabledButton->setChecked(true);
-       enabledButton->setIcon(KIcon("novisible"));
+        enabledButton->setChecked(true);
+        enabledButton->setIcon(KIcon("novisible"));
     }
     else {
         enabledButton->setChecked(false);
-       enabledButton->setIcon(KIcon("visible"));
+        enabledButton->setIcon(KIcon("visible"));
     }
 
     connect(collapseButton, SIGNAL(clicked()), this, SLOT(slotSwitch()));
@@ -134,11 +134,11 @@ CollapsibleEffect::CollapsibleEffect(const QDomElement &effect, const QDomElemen
         sp->setFocusPolicy( Qt::StrongFocus );
     }
     Q_FOREACH( KComboBox * cb, findChildren<KComboBox*>() ) {
-       cb->installEventFilter( this );
+        cb->installEventFilter( this );
         cb->setFocusPolicy( Qt::StrongFocus );
     }
     Q_FOREACH( QProgressBar * cb, findChildren<QProgressBar*>() ) {
-       cb->installEventFilter( this );
+        cb->installEventFilter( this );
         cb->setFocusPolicy( Qt::StrongFocus );
     }
 }
@@ -162,8 +162,8 @@ void CollapsibleEffect::slotCreateRegion()
     d->setOperationMode(KFileDialog::Opening);
     d->setMode(KFile::File);
     if (d->exec() == QDialog::Accepted) {
-       KUrl url = d->selectedUrl();
-       if (!url.isEmpty()) emit createRegion(effectIndex(), url);
+        KUrl url = d->selectedUrl();
+        if (!url.isEmpty()) emit createRegion(effectIndex(), url);
     }
     delete d;
 }
@@ -176,52 +176,52 @@ void CollapsibleEffect::slotUnGroup()
 bool CollapsibleEffect::eventFilter( QObject * o, QEvent * e ) 
 {
     if (e->type() == QEvent::Enter) {
-       frame->setProperty("mouseover", true);
-       frame->setStyleSheet(frame->styleSheet());
-       return QWidget::eventFilter(o, e);
+        frame->setProperty("mouseover", true);
+        frame->setStyleSheet(frame->styleSheet());
+        return QWidget::eventFilter(o, e);
     }
     if (e->type() == QEvent::Wheel) {
-       QWheelEvent *we = static_cast<QWheelEvent *>(e);
-       if (!filterWheelEvent || we->modifiers() != Qt::NoModifier) {
-           e->accept();
-           return false;
-       }
-       if (qobject_cast<QAbstractSpinBox*>(o)) {
-           if(qobject_cast<QAbstractSpinBox*>(o)->focusPolicy() == Qt::WheelFocus)
-           {
-               e->accept();
-               return false;
-           }
-           else
-           {
-               e->ignore();
-               return true;
-           }
-       }
-       if (qobject_cast<KComboBox*>(o)) {
-           if(qobject_cast<KComboBox*>(o)->focusPolicy() == Qt::WheelFocus)
-           {
-               e->accept();
-               return false;
-           }
-           else
-           {
-               e->ignore();
-               return true;
-           }
-       }
-       if (qobject_cast<QProgressBar*>(o)) {
-           if(qobject_cast<QProgressBar*>(o)->focusPolicy() == Qt::WheelFocus)
-           {
-               e->accept();
-               return false;
-           }
-           else
-           {
-               e->ignore();
-               return true;
-           }
-       }
+        QWheelEvent *we = static_cast<QWheelEvent *>(e);
+        if (!filterWheelEvent || we->modifiers() != Qt::NoModifier) {
+            e->accept();
+            return false;
+        }
+        if (qobject_cast<QAbstractSpinBox*>(o)) {
+            if(qobject_cast<QAbstractSpinBox*>(o)->focusPolicy() == Qt::WheelFocus)
+            {
+                e->accept();
+                return false;
+            }
+            else
+            {
+                e->ignore();
+                return true;
+            }
+        }
+        if (qobject_cast<KComboBox*>(o)) {
+            if(qobject_cast<KComboBox*>(o)->focusPolicy() == Qt::WheelFocus)
+            {
+                e->accept();
+                return false;
+            }
+            else
+            {
+                e->ignore();
+                return true;
+            }
+        }
+        if (qobject_cast<QProgressBar*>(o)) {
+            if(qobject_cast<QProgressBar*>(o)->focusPolicy() == Qt::WheelFocus)
+            {
+                e->accept();
+                return false;
+            }
+            else
+            {
+                e->ignore();
+                return true;
+            }
+        }
     }
     return QWidget::eventFilter(o, e);
 }
@@ -253,8 +253,8 @@ void CollapsibleEffect::mouseDoubleClickEvent ( QMouseEvent * event )
 
 void CollapsibleEffect::mouseReleaseEvent( QMouseEvent *event )
 {
-  if (!decoframe->property("active").toBool()) emit activateEffect(effectIndex());
-  QWidget::mouseReleaseEvent(event);
+    if (!decoframe->property("active").toBool()) emit activateEffect(effectIndex());
+    QWidget::mouseReleaseEvent(event);
 }
 
 void CollapsibleEffect::slotDisable(bool disable, bool emitInfo)
@@ -337,8 +337,7 @@ void CollapsibleEffect::slotShow(bool show)
     if (show) {
         collapseButton->setArrowType(Qt::DownArrow);
         m_info.isCollapsed = false;
-    }
-    else {
+    } else {
         collapseButton->setArrowType(Qt::RightArrow);
         m_info.isCollapsed = true;
     }
@@ -355,18 +354,18 @@ void CollapsibleEffect::updateCollapsedState()
 {
     QString info = m_info.toString();
     if (info != m_effect.attribute("kdenlive_info")) {
-       m_effect.setAttribute("kdenlive_info", info);
-       emit parameterChanged(m_original_effect, m_effect, effectIndex());   
+        m_effect.setAttribute("kdenlive_info", info);
+        emit parameterChanged(m_original_effect, m_effect, effectIndex());
     }
 }
 
 void CollapsibleEffect::setGroupIndex(int ix)
 {
     if (m_info.groupIndex == -1 && ix != -1) {
-       m_menu->removeAction(m_groupAction); 
+        m_menu->removeAction(m_groupAction);
     }
     else if (m_info.groupIndex != -1 && ix == -1) {
-       m_menu->addAction(m_groupAction); 
+        m_menu->addAction(m_groupAction);
     }
     m_info.groupIndex = ix;
     m_effect.setAttribute("kdenlive_info", m_info.toString());
@@ -386,7 +385,7 @@ QString CollapsibleEffect::infoString() const
 void CollapsibleEffect::removeFromGroup()
 {
     if (m_info.groupIndex != -1) {
-       m_menu->addAction(m_groupAction); 
+        m_menu->addAction(m_groupAction);
     }
     m_info.groupIndex = -1;
     m_info.groupName.clear();
@@ -417,23 +416,23 @@ void CollapsibleEffect::updateWidget(const ItemInfo &info, const QDomElement &ef
 void CollapsibleEffect::setupWidget(const ItemInfo &info, EffectMetaInfo *metaInfo)
 {
     if (m_effect.isNull()) {
-//         kDebug() << "// EMPTY EFFECT STACK";
+        //         kDebug() << "// EMPTY EFFECT STACK";
         return;
     }
 
     if (m_effect.attribute("tag") == "region") {
-       m_regionEffect = true;
+        m_regionEffect = true;
         QDomNodeList effects =  m_effect.elementsByTagName("effect");
         QDomNodeList origin_effects =  m_original_effect.elementsByTagName("effect");
-       m_paramWidget = new ParameterContainer(m_effect, info, metaInfo, widgetFrame);
+        m_paramWidget = new ParameterContainer(m_effect, info, metaInfo, widgetFrame);
         QWidget *container = new QWidget(widgetFrame);
-       QVBoxLayout *vbox = static_cast<QVBoxLayout *> (widgetFrame->layout());
+        QVBoxLayout *vbox = static_cast<QVBoxLayout *> (widgetFrame->layout());
         vbox->addWidget(container);
-       // m_paramWidget = new ParameterContainer(m_effect.toElement(), info, metaInfo, container);
+        // m_paramWidget = new ParameterContainer(m_effect.toElement(), info, metaInfo, container);
         for (int i = 0; i < effects.count(); ++i) {
             CollapsibleEffect *coll = new CollapsibleEffect(effects.at(i).toElement(), origin_effects.at(i).toElement(), info, metaInfo, container);
             m_subParamWidgets.append(coll);
-           connect(coll, SIGNAL(parameterChanged(QDomElement,QDomElement,int)), this , SLOT(slotUpdateRegionEffectParams(QDomElement,QDomElement,int)));
+            connect(coll, SIGNAL(parameterChanged(QDomElement,QDomElement,int)), this , SLOT(slotUpdateRegionEffectParams(QDomElement,QDomElement,int)));
             //container = new QWidget(widgetFrame);
             vbox->addWidget(coll);
             //p = new ParameterContainer(effects.at(i).toElement(), info, isEffect, container);
@@ -442,18 +441,18 @@ void CollapsibleEffect::setupWidget(const ItemInfo &info, EffectMetaInfo *metaIn
     }
     else {
         m_paramWidget = new ParameterContainer(m_effect, info, metaInfo, widgetFrame);
-       connect(m_paramWidget, SIGNAL(disableCurrentFilter(bool)), this, SLOT(slotDisableEffect(bool)));
+        connect(m_paramWidget, SIGNAL(disableCurrentFilter(bool)), this, SLOT(slotDisableEffect(bool)));
         if (m_effect.firstChildElement("parameter").isNull()) {
             // Effect has no parameter, don't allow expand
             collapseButton->setEnabled(false);
-           collapseButton->setVisible(false);
-            widgetFrame->setVisible(false);            
+            collapseButton->setVisible(false);
+            widgetFrame->setVisible(false);
         }
     }
     if (collapseButton->isEnabled() && m_info.isCollapsed) {
-       widgetFrame->setVisible(false);
-       collapseButton->setArrowType(Qt::RightArrow);
-       
+        widgetFrame->setVisible(false);
+        collapseButton->setArrowType(Qt::RightArrow);
+
     }
     connect (m_paramWidget, SIGNAL(parameterChanged(QDomElement,QDomElement,int)), this, SIGNAL(parameterChanged(QDomElement,QDomElement,int)));
     
@@ -507,9 +506,9 @@ void CollapsibleEffect::slotSyncEffectsPos(int pos)
 void CollapsibleEffect::dragEnterEvent(QDragEnterEvent *event)
 {
     if (event->mimeData()->hasFormat("kdenlive/effectslist")) {
-       frame->setProperty("target", true);
-       frame->setStyleSheet(frame->styleSheet());
-       event->acceptProposedAction();
+        frame->setProperty("target", true);
+        frame->setStyleSheet(frame->styleSheet());
+        event->acceptProposedAction();
     }
 }
 
@@ -531,52 +530,52 @@ void CollapsibleEffect::dropEvent(QDropEvent *event)
     int ix = e.attribute("kdenlive_ix").toInt();
     int currentEffectIx = effectIndex();
     if (ix == currentEffectIx) {
-       // effect dropped on itself, reject
-       event->ignore();
-       return;
+        // effect dropped on itself, reject
+        event->ignore();
+        return;
     }
     if (ix == 0 || e.tagName() == "effectgroup") {
-       if (e.tagName() == "effectgroup") {
-           // moving a group
-           QDomNodeList subeffects = e.elementsByTagName("effect");
-           if (subeffects.isEmpty()) {
-               event->ignore();
-               return;
-           }
-           EffectInfo info;
-           info.fromString(subeffects.at(0).toElement().attribute("kdenlive_info"));
-           event->setDropAction(Qt::MoveAction);
-           event->accept();
-           if (info.groupIndex >= 0) {
-               // Moving group
-               QList <int> effectsIds;
-               // Collect moved effects ids
-               for (int i = 0; i < subeffects.count(); ++i) {
-                   QDomElement effect = subeffects.at(i).toElement();
-                   effectsIds << effect.attribute("kdenlive_ix").toInt();
-               }
-               emit moveEffect(effectsIds, currentEffectIx, info.groupIndex, info.groupName);
-           }
-           else {
-               // group effect dropped from effect list
-               if (m_info.groupIndex > -1) {
-                   // TODO: Should we merge groups??
-                   
-               }
-               emit addEffect(e);
-           }
-           return;
-       }
-       // effect dropped from effects list, add it
-       e.setAttribute("kdenlive_ix", ix);
-       if (m_info.groupIndex > -1) {
-           // Dropped on a group
-           e.setAttribute("kdenlive_info", m_info.toString());
-       }
-       event->setDropAction(Qt::CopyAction);
-       event->accept();
-       emit addEffect(e);
-       return;
+        if (e.tagName() == "effectgroup") {
+            // moving a group
+            QDomNodeList subeffects = e.elementsByTagName("effect");
+            if (subeffects.isEmpty()) {
+                event->ignore();
+                return;
+            }
+            EffectInfo info;
+            info.fromString(subeffects.at(0).toElement().attribute("kdenlive_info"));
+            event->setDropAction(Qt::MoveAction);
+            event->accept();
+            if (info.groupIndex >= 0) {
+                // Moving group
+                QList <int> effectsIds;
+                // Collect moved effects ids
+                for (int i = 0; i < subeffects.count(); ++i) {
+                    QDomElement effect = subeffects.at(i).toElement();
+                    effectsIds << effect.attribute("kdenlive_ix").toInt();
+                }
+                emit moveEffect(effectsIds, currentEffectIx, info.groupIndex, info.groupName);
+            }
+            else {
+                // group effect dropped from effect list
+                if (m_info.groupIndex > -1) {
+                    // TODO: Should we merge groups??
+
+                }
+                emit addEffect(e);
+            }
+            return;
+        }
+        // effect dropped from effects list, add it
+        e.setAttribute("kdenlive_ix", ix);
+        if (m_info.groupIndex > -1) {
+            // Dropped on a group
+            e.setAttribute("kdenlive_info", m_info.toString());
+        }
+        event->setDropAction(Qt::CopyAction);
+        event->accept();
+        emit addEffect(e);
+        return;
     }
     emit moveEffect(QList <int> () <<ix, currentEffectIx, m_info.groupIndex, m_info.groupName);
     event->setDropAction(Qt::MoveAction);

diff --git a/src/effectstack/effectstackview2.cpp b/src/effectstack/effectstackview2.cpp
index 1cabfeba85db3a921e7999beefc7e8921259631a..4a8889194eb6582f51759b39475319426dd3adfe 100644 (file)
--- a/src/effectstack/effectstackview2.cpp
+++ b/src/effectstack/effectstackview2.cpp
@@ -557,7 +557,7 @@ void EffectStackView2::deleteCurrentEffect()
     }
 }
 
-void EffectStackView2::updateProjectFormat(MltVideoProfile profile, Timecode t)
+void EffectStackView2::updateProjectFormat(const MltVideoProfile &profile, const Timecode &t)
 {
     m_effectMetaInfo.profile = profile;
     m_effectMetaInfo.timecode = t;

diff --git a/src/effectstack/effectstackview2.h b/src/effectstack/effectstackview2.h
index f6d2bad16af980b3c0ced5bc46536c24013a012d..dde1871b279f88375871c1db0848ca9a8ebcbe59 100644 (file)
--- a/src/effectstack/effectstackview2.h
+++ b/src/effectstack/effectstackview2.h
@@ -53,7 +53,7 @@ public:
     void clear();
 
     /** @brief Passes updates on @param profile and @param t on to the effect editor. */
-    void updateProjectFormat(MltVideoProfile profile, Timecode t);
+    void updateProjectFormat(const MltVideoProfile &profile, const Timecode &t);
 
     /** @brief Tells the effect editor to update its timecode format. */
     void updateTimecodeFormat();