Add const to foreach, some indent fixes

svn path=/branches/KDE4/; revision=2188

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index edae29e3cf1482b5d54e0db16033ed101536aa8f..e95e8fd13512c32b95c9418ae8db9f1c05f0f54c 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -822,12 +822,12 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
             m_commandStack->push(command);
             m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())));
         }
-        if (m_dragItem->type() == TRANSITIONWIDGET && ( m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track )) {
+        if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
             MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
             m_commandStack->push(command);
             //kDebug()<<"/// MOVING TRS FROM: "<<(int)(m_tracksList.count() - m_startPos.y())<<", OFFSET: "<<(int) (m_dragItem->track() - m_startPos.y());
             Transition *transition = (Transition *) m_dragItem;
-           transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track()));
+            transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track()));
             m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
         }
 

diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp
index 7286b7c028d353227de850bad0797d39c8c52614..9a821c98121aa199286b46a308b9453916b0bdff 100644 (file)
--- a/src/effectslistwidget.cpp
+++ b/src/effectslistwidget.cpp
@@ -49,19 +49,19 @@ void EffectsListWidget::initList() {
     clear();
     QStringList names = MainWindow::videoEffects.effectNames();
     QListWidgetItem *item;
-    foreach(QString str, names) {
+    foreach(const QString &str, names) {
         item = new QListWidgetItem(str, this);
         item->setData(Qt::UserRole, QString::number((int) EFFECT_VIDEO));
     }
 
     names = MainWindow::audioEffects.effectNames();
-    foreach(QString str, names) {
+    foreach(const QString &str, names) {
         item = new QListWidgetItem(str, this);
         item->setData(Qt::UserRole, QString::number((int) EFFECT_AUDIO));
     }
 
     names = MainWindow::customEffects.effectNames();
-    foreach(QString str, names) {
+    foreach(const QString &str, names) {
         item = new QListWidgetItem(str, this);
         item->setData(Qt::UserRole, QString::number((int) EFFECT_CUSTOM));
     }

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 429dc2a6b4bf155d94087f3123af21bf1c5e7924..39eb7d088808d12876bf3a12c696e65fbc50008f 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -90,8 +90,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d, int , int) {
             pa.setAttribute("format", "%d%,%d%:%d%x%d%:%d%");
             pa.setAttribute("min", "-200;-20;0;0;0");
             pa.setAttribute("max", "200;200;100;100;100");
-        }
-        else if (type == "complex") {
+        } else if (type == "complex") {
             //pa.setAttribute("namedesc",pa.attribute("name"));
 
         }
@@ -235,11 +234,11 @@ void EffectStackEdit::slotSliderMoved(int) {
 }
 
 void EffectStackEdit::clearAllItems() {
-    foreach(QWidget* w, items) {
+    foreach(QWidget *w, items) {
         vbox->removeWidget(w);
         delete w;
     }
-    foreach(void * p, uiItems) {
+    foreach(void *p, uiItems) {
         delete p;
     }
     uiItems.clear();

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index d7ad6f69b90360d38cf7546d79d82ea7e2063586..5605158cfef14ce56e492def1a48f850fa6dfac5 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -163,7 +163,7 @@ void EffectStackView::slotResetEffect() {
     QDomElement old = clipref->effectAt(activeRow).cloneNode().toElement();
     QDomElement dom;
     QString effectName = ui.effectlist->currentItem()->text();
-    foreach(QString type, effectLists.keys()) {
+    foreach(const QString &type, effectLists.keys()) {
         EffectsList *list = effectLists[type];
         if (list->effectNames().contains(effectName)) {
             dom = list->getEffectByName(effectName);
@@ -182,13 +182,13 @@ void EffectStackView::slotNewEffect() {
 
     QMenu *displayMenu = new QMenu(this);
     displayMenu->setTitle("Filters");
-    foreach(QString type, effectLists.keys()) {
+    foreach(const QString &type, effectLists.keys()) {
         QAction *a = new QAction(type, displayMenu);
         EffectsList *list = effectLists[type];
 
         QMenu *parts = new QMenu(type, displayMenu);
         parts->setTitle(type);
-        foreach(QString name, list->effectNames()) {
+        foreach(const QString &name, list->effectNames()) {
             QAction *entry = new QAction(name, parts);
             entry->setData(name);
             entry->setToolTip(list->getInfo(name));
@@ -204,7 +204,7 @@ void EffectStackView::slotNewEffect() {
 
     if (result) {
         //TODO effects.append(result->data().toString());
-        foreach(EffectsList* e, effectLists.values()) {
+        foreach(const EffectsList *e, effectLists.values()) {
             QDomElement dom = e->getEffectByName(result->data().toString());
             if (clipref)
                 clipref->addEffect(dom);

diff --git a/src/graphicsscenerectmove.cpp b/src/graphicsscenerectmove.cpp
index 6e47bb19e76d6d0b197fa6c7fc378a5b82885286..658871fe4e8ee332c2efc3bf054167bfe3a10cdc 100644 (file)
--- a/src/graphicsscenerectmove.cpp
+++ b/src/graphicsscenerectmove.cpp
@@ -109,7 +109,7 @@ void GraphicsSceneRectMove::mousePressEvent(QGraphicsSceneMouseEvent* e) {
     bool hasSelected = false;
 
     if (m_tool == TITLE_SELECT) {
-        foreach(QGraphicsItem* g, list) {
+        foreach(QGraphicsItem *g, list) {
             kDebug() << " - - CHECKING ITEM Z:" << g->zValue() << ", TYPE: " << g->type();
             // check is there is a selected item in list
             if (g->zValue() > -1000 && g->isSelected()) {
@@ -261,7 +261,7 @@ void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent* e) {
         p += QPoint(-2, -2);
         resizeMode = NoResize;
         bool itemFound = false;
-        foreach(QGraphicsItem* g, items(QRectF(p , QSizeF(4, 4)).toRect())) {
+        foreach(const QGraphicsItem* g, items(QRectF(p , QSizeF(4, 4)).toRect())) {
             if ((g->type() == 13 || g->type() == 7) && g->zValue() > -1000) {
                 // image or svg item
                 setCursor(Qt::OpenHandCursor);

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index beb81c1e5d694c2a611fff6856846b774850b1f5..ffb9be64fbd49d1e12ccc108a97538bcd09c33d8 100644 (file)
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -44,7 +44,7 @@ void initEffectsThumbnailer::prepareThumbnailsCall(const QStringList& list) {
 }
 
 void initEffectsThumbnailer::run() {
-    foreach(QString entry, m_list) {
+    foreach(const QString &entry, m_list) {
         kDebug() << entry;
         if (!entry.isEmpty() && (entry.endsWith(".png") || entry.endsWith(".pgm"))) {
             if (!EffectStackEdit::iconCache.contains(entry)) {
@@ -125,7 +125,7 @@ Mlt::Repository *initEffects::parseEffectFiles() {
             // kDebug()<<"//  FOUND EFFECT FILE: "<<itemName<<endl;
         }
     }
-    foreach(QString filtername, filtersList) {
+    foreach(const QString &filtername, filtersList) {
         QDomDocument doc = createDescriptionFromMlt(repository, "filters", filtername);
         if (!doc.isNull())
             MainWindow::videoEffects.append(doc.documentElement());
@@ -262,7 +262,7 @@ char* initEffects::ladspaEffectString(int ladspaId, QStringList params) {
         return ladspaEqualizerEffectString(params);
     else {
         kDebug() << "++++++++++  ASKING FOR UNKNOWN LADSPA EFFECT: " << ladspaId << endl;
-        return("<jackrack></jackrack>");
+        return (char *) "<jackrack></jackrack>";
     }
 }
 
@@ -439,7 +439,7 @@ QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository,
 }
 
 void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList* transitions, QStringList names) {
-    foreach(QString name, names) {
+    foreach(const QString &name, names) {
         QDomDocument ret;
         QDomElement ktrans = ret.createElement("ktransition");
         ret.appendChild(ktrans);
@@ -559,7 +559,7 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
         paramList.append(quickParameterFill(ret, "Reverse Transition", "reverse", "bool", "1", "0", "1"));
         ktrans.appendChild(tname);
 
-        foreach(QDomElement e, paramList) {
+        foreach(const QDomElement &e, paramList) {
             ktrans.appendChild(e);
         }
 

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3bb6b22283c1160282e357788e14beb9e79d90ed..a5319ac44f01a7b2a2a37f1119da899d24465d3a 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -188,21 +188,21 @@ MainWindow::MainWindow(QWidget *parent)
     QAction *action;
     QMenu *videoEffectsMenu = (QMenu*)(factory()->container("video_effects_menu", this));
     QStringList effects = videoEffects.effectNames();
-    foreach(QString name, effects) {
+    foreach(const QString &name, effects) {
         action = new QAction(name, this);
         action->setData(name);
         videoEffectsMenu->addAction(action);
     }
     QMenu *audioEffectsMenu = (QMenu*)(factory()->container("audio_effects_menu", this));
     effects = audioEffects.effectNames();
-    foreach(QString name, effects) {
+    foreach(const QString &name, effects) {
         action = new QAction(name, this);
         action->setData(name);
         audioEffectsMenu->addAction(action);
     }
     QMenu *customEffectsMenu = (QMenu*)(factory()->container("custom_effects_menu", this));
     effects = customEffects.effectNames();
-    foreach(QString name, effects) {
+    foreach(const QString &name, effects) {
         action = new QAction(name, this);
         action->setData(name);
         customEffectsMenu->addAction(action);

diff --git a/src/moveeffectcommand.cpp b/src/moveeffectcommand.cpp
index 0f7f03c5b63433fb293041e9b76a41880549b6dc..42040f813ccbd1287909a06b3a5936940ad33578 100644 (file)
--- a/src/moveeffectcommand.cpp
+++ b/src/moveeffectcommand.cpp
@@ -24,11 +24,11 @@
 
 MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, bool doIt)
         : m_view(view), m_track(track), m_pos(pos), m_oldindex(oldPos), m_newindex(newPos), m_doIt(doIt) {
-/*    QString effectName;
-    QDomNode namenode = effect.elementsByTagName("name").item(0);
-    if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
-    else effectName = i18n("effect");
-    setText(i18n("Move effect %1", effectName));*/
+    /*    QString effectName;
+        QDomNode namenode = effect.elementsByTagName("name").item(0);
+        if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+        else effectName = i18n("effect");
+        setText(i18n("Move effect %1", effectName));*/
     setText(i18n("Move effect"));
 }
 

diff --git a/src/parameterplotter.cpp b/src/parameterplotter.cpp
index 4f7394c0c4965f3b0ea9713bdbea7a6aac0c3461..99f9e65f04782a10cd5b2624f62c922ba4f7dece 100644 (file)
--- a/src/parameterplotter.cpp
+++ b/src/parameterplotter.cpp
@@ -150,7 +150,7 @@ void ParameterPlotter::createParametersNew() {
     if (namenode.count() > 0) {
         for (int i = 0;i < plotobjs.count();i++) {
             QList<KPlotPoint*> points = plotobjs[i]->points();
-            foreach(KPlotPoint *o, points) {
+            foreach(const KPlotPoint *o, points) {
                 txtstr << (int)o->y() ;
                 break;//first no keyframes
             }
@@ -236,7 +236,7 @@ void ParameterPlotter::mousePressEvent(QMouseEvent * event) {
                 double newx = inPlot.x() * dataRect().width() / pixRect().width();
                 double newy = (height() - inPlot.y() - bottomPadding() - topPadding()) * dataRect().height() / pixRect().height();
                 bool inserted = false;
-                foreach(KPlotPoint* pt, points) {
+                foreach(const KPlotPoint* pt, points) {
                     if (pt->x() > newx && !inserted) {
                         newpoints.append(QPointF(newx, newy));
                         inserted = true;
@@ -244,7 +244,7 @@ void ParameterPlotter::mousePressEvent(QMouseEvent * event) {
                     newpoints.append(QPointF(pt->x(), pt->y()));
                 }
                 p->clearPoints();
-                foreach(QPointF qf, newpoints) {
+                foreach(const QPointF qf, newpoints) {
                     p->addPoint(qf);
                 }
                 replacePlotObject(activeIndexPlot, p);

diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp
index 78721e5ea7ed7c29890a5a28b4c219781022f6d0..022ea16238e80883877b829876f44fd531f6c286 100644 (file)
--- a/src/projectlistview.cpp
+++ b/src/projectlistview.cpp
@@ -137,7 +137,7 @@ void ProjectListView::dropEvent(QDropEvent *event) {
         }
         QList <QUrl> list;
         list = event->mimeData()->urls();
-        foreach(QUrl url, list) {
+        foreach(const QUrl &url, list) {
             emit addClip(url, groupName);
         }
 
@@ -215,7 +215,7 @@ void ProjectListView::mouseMoveEvent(QMouseEvent *event) {
             QList <QTreeWidgetItem *> list;
             list = selectedItems();
             QStringList ids;
-            foreach(QTreeWidgetItem *item, list) {
+            foreach(const QTreeWidgetItem *item, list) {
                 // TODO allow dragging of folders
                 ids.append(QString::number(((ProjectItem *) item)->clipId()));
             }

diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp
index ea7c62f0ab48815a0ee8355ad2315e5d7316f351..79ce97f0bb8cf2e5a26a569202a268ca9e214e67 100644 (file)
--- a/src/slideshowclip.cpp
+++ b/src/slideshowclip.cpp
@@ -75,7 +75,7 @@ void SlideshowClip::parseFolder() {
     if (m_count == 0) m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
     else m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
     m_view.label_info->setText(i18n("%1 images found", m_count));
-    foreach(QString path, result) {
+    foreach(const QString &path, result) {
         QIcon icon(dir.filePath(path));
         QListWidgetItem *item = new QListWidgetItem(icon, KUrl(path).fileName());
         m_view.icon_list->addItem(item);

diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp
index d93c430e4d64b2539217fa7a57027df23d2a8838..292aab2d00816b30c66c0676d40bf1060062919b 100644 (file)
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -48,7 +48,7 @@ void TransitionSettings::slotTransitionChanged() {
          m_usedTransition->update();
      }
      emit transitionUpdated(e, m_usedTransition->toXML());*/
-    /*QDomDocument doc;    
+    /*QDomDocument doc;
     doc.appendChild(doc.importNode(e, true));
     kDebug()<<"///////////  TRANSITION CHANGED: "<<doc.toString();
     kDebug()<<"///////////  TRANSITION CHANGED END...";*/